diff --git a/.collaboration b/.collaboration
index 65208f5a..d80e8133 100644
--- a/.collaboration
+++ b/.collaboration
@@ -2270,16 +2270,7 @@
   },
   {
     "ModuleName": "ServerCommand/getEmployeeWorkHoursData",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-09-02T13:15:31.2419809+08:00",
-    "ModuleType": 15,
-    "ToRemoveFiles": [
-      "ServerCommands\\OPENAPI\\getEmployeeWorkHoursData.json"
-    ]
+    "ModuleType": 15
   },
   {
     "ModuleName": "Image/魔法棒-默认.svg",
diff --git a/ServerCommands/OPENAPI/getEmployeeWorkHoursData.json b/ServerCommands/OPENAPI/getEmployeeWorkHoursData.json
index 0ad56fe9..5839b2f5 100644
--- a/ServerCommands/OPENAPI/getEmployeeWorkHoursData.json
+++ b/ServerCommands/OPENAPI/getEmployeeWorkHoursData.json
@@ -66,7 +66,7 @@
         "TableValueType": 1,
         "BindingInfos": [
           {
-            "GUID": "103b6f46-ca4a-4b5c-a9b5-ade05d581fe2",
+            "GUID": "fd2033cc-b7c1-46e0-9d57-0cf91138b9ef",
             "BindingInfo": {
               "TableName": "用户信息视图",
               "ColumnName": "用户名",
@@ -87,7 +87,7 @@
               },
               "Value": {
                 "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                "SerializeProperty": "=完整JSON对象.user"
+                "SerializeProperty": "=完整JSON对象.userName"
               }
             },
             {
@@ -99,7 +99,7 @@
               },
               "Value": {
                 "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                "SerializeProperty": "=完整JSON对象.user"
+                "SerializeProperty": "=完整JSON对象.userName"
               }
             }
           ],
@@ -108,7 +108,7 @@
         "NullFormulaValueQueryPolicy": 0,
         "TopCount": "1"
       },
-      "ID": "8f86aaa3aa6e44c49f3843bdb66346a6"
+      "ID": "cb165c67a9a143dbb7e83625511d4d37"
     },
     {
       "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -127,71 +127,6 @@
             "compareType": 1
           },
           "CommandList": [
-            {
-              "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon",
-              "ServerCommandName": "Base根据汇报模板生成内容",
-              "Parameters": [
-                {
-                  "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
-                  "ParamName": "生成日期",
-                  "Value": {
-                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                    "SerializeProperty": "=完整JSON对象.startData"
-                  }
-                },
-                {
-                  "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
-                  "ParamName": "汇报类型",
-                  "Value": "日报"
-                },
-                {
-                  "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
-                  "ParamName": "汇报对象",
-                  "Value": "个人"
-                },
-                {
-                  "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
-                  "ParamName": "对象ID"
-                },
-                {
-                  "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
-                  "ParamName": "汇报人",
-                  "Value": {
-                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                    "SerializeProperty": "=用户名.用户名"
-                  }
-                }
-              ],
-              "ResultErrorCodeTo": {
-                "SerializeProperty": "返回码"
-              },
-              "ResultMessageTo": {
-                "SerializeProperty": "返回信息"
-              },
-              "ReturnPropertiesTo": [
-                {
-                  "ResultPropertyName": "日报内容",
-                  "ResultTo": {
-                    "SerializeProperty": "日报内容"
-                  }
-                },
-                {
-                  "ResultPropertyName": "日报文本",
-                  "ResultTo": {
-                    "SerializeProperty": "日报纯文本"
-                  }
-                },
-                {
-                  "ResultPropertyName": "返回总工时",
-                  "ResultTo": {
-                    "SerializeProperty": "总工时"
-                  }
-                }
-              ],
-              "RefreshAfterFinish": true,
-              "CheckDataValidation": true,
-              "Disabled": true
-            },
             {
               "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
               "ParameterName": "工时记录",
@@ -199,7 +134,7 @@
                 "TableName": "任务工时表",
                 "BindingInfos": [
                   {
-                    "GUID": "88e5af6f-ecb8-4b52-a20e-4ba943582ec7",
+                    "GUID": "e684ea2d-1225-4d81-9e78-933530738382",
                     "BindingInfo": {
                       "TableName": "任务工时表",
                       "ColumnName": "工时日期",
@@ -208,7 +143,7 @@
                     "ColumnName": "工时日期"
                   },
                   {
-                    "GUID": "16261470-dcb6-4041-a474-ece27665f9ef",
+                    "GUID": "11f4f903-3609-4c07-862c-fe4e38a18a35",
                     "BindingInfo": {
                       "TableName": "任务工时表",
                       "ColumnName": "项目ID",
@@ -222,7 +157,7 @@
                     "ColumnName": "项目名称"
                   },
                   {
-                    "GUID": "6341c819-03a2-40f4-97ef-08dea5902d73",
+                    "GUID": "3eb8cf6f-c8c1-4f56-9405-4a59ef2eab3b",
                     "BindingInfo": {
                       "TableName": "任务工时表",
                       "ColumnName": "任务ID",
@@ -236,7 +171,7 @@
                     "ColumnName": "任务名称"
                   },
                   {
-                    "GUID": "91995ec0-2d70-4f4e-9186-dfd514302dbd",
+                    "GUID": "104cd50a-2b5e-45bb-b574-c1893a50d218",
                     "BindingInfo": {
                       "TableName": "任务工时表",
                       "ColumnName": "执行内容",
@@ -245,7 +180,7 @@
                     "ColumnName": "工作内容"
                   },
                   {
-                    "GUID": "3a800fc9-d9f3-4594-bd31-8c13a718c8f2",
+                    "GUID": "66c2a513-836d-4e2f-b58b-d08cd2c7c69f",
                     "BindingInfo": {
                       "TableName": "任务工时表",
                       "ColumnName": "工时",
@@ -279,7 +214,7 @@
                       },
                       "Value": {
                         "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                        "SerializeProperty": "=startDate"
+                        "SerializeProperty": "=完整JSON对象.startDate"
                       }
                     },
                     {
@@ -292,7 +227,7 @@
                       },
                       "Value": {
                         "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                        "SerializeProperty": "=endDate"
+                        "SerializeProperty": "=完整JSON对象.endDate"
                       }
                     },
                     {
@@ -320,30 +255,61 @@
                   ]
                 }
               },
-              "ID": "01365f8058d44b89b3c537fe97f00921"
+              "ID": "b794fa83ce7c46aa83426cde5f0cba2e"
             },
             {
-              "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
-              "ErrorCode": {
-                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                "SerializeProperty": "=返回码"
-              },
-              "Message": {
-                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                "SerializeProperty": "=返回信息"
-              },
-              "CustomReturns": [
+              "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+              "ConditionAndCommandPairList": [
                 {
-                  "ReturnPropertyName": "worksList",
-                  "Value": {
-                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                    "SerializeProperty": "=工时记录"
-                  }
+                  "Condition": {
+                    "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                    "param": {
+                      "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
+                      "ParamObject": {
+                        "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                        "SerializeProperty": "=工时记录.Count"
+                      }
+                    },
+                    "value": "0",
+                    "compareType": 2
+                  },
+                  "CommandList": [
+                    {
+                      "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+                      "ErrorCode": "0",
+                      "Message": "获取成功",
+                      "CustomReturns": [
+                        {
+                          "ReturnPropertyName": "worksList",
+                          "Value": {
+                            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                            "SerializeProperty": "=工时记录"
+                          }
+                        }
+                      ]
+                    }
+                  ],
+                  "ID": "9e648495-e14a-4f60-b9cb-0007d8c05670"
+                },
+                {
+                  "CommandList": [
+                    {
+                      "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+                      "ErrorCode": "400",
+                      "Message": "该成员在时间范围内没有工作记录",
+                      "CustomReturns": [
+                        {
+                          "ReturnPropertyName": "worksList"
+                        }
+                      ]
+                    }
+                  ],
+                  "ID": "64bfb3ec-442c-4703-af71-1737bb90b0cc"
                 }
               ]
             }
           ],
-          "ID": "79473741-fec9-4faa-a59b-87b9e152a8f3"
+          "ID": "f664451f-5d7b-4636-b216-4e362c777afc"
         },
         {
           "CommandList": [
@@ -358,7 +324,7 @@
               ]
             }
           ],
-          "ID": "3910ad3d-a7c6-46c3-8356-645d5cf69f5c"
+          "ID": "3a0f3f04-a46d-4721-92c1-2b06174c8ea4"
         }
       ]
     }