From eab76de8370ae46d55886120985300559aa2f6af Mon Sep 17 00:00:00 2001
From: cuckooent <phoben@qq.com>
Date: Thu, 3 Apr 2025 13:32:47 +0800
Subject: [PATCH] =?UTF-8?q?{"Message":"1","MessageType":2,"Modules":[{"Sta?=
 =?UTF-8?q?te":1,"Type":27,"Name":"ServerCommandPrivate/=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E9=92=89=E9=92=89=E9=85=8D=E7=BD=AE"},{"State":1,"Typ?=
 =?UTF-8?q?e":11,"Name":"UserService"},{"State":1,"Type":27,"Name":"Server?=
 =?UTF-8?q?CommandPrivate/=E5=8F=91=E9=80=81=E9=92=89=E9=92=89=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E6=97=A5=E6=8A=A5"}],"Version":"v1"}?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .collaboration                            |  35 ++--------------------
 ServerCommands/钉钉/发送钉钉工作日报.json |  17 ++++++-----
 UserServiceDB.sqlite3                     | Bin 606208 -> 606208 bytes
 3 files changed, 12 insertions(+), 40 deletions(-)

diff --git a/.collaboration b/.collaboration
index 6828902a..90d8337f 100644
--- a/.collaboration
+++ b/.collaboration
@@ -1906,16 +1906,7 @@
   },
   {
     "ModuleName": "ServerCommandPrivate/初始化钉钉配置",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2025-04-03T13:31:27.4531634+08:00",
-    "ModuleType": 27,
-    "ToRemoveFiles": [
-      "ServerCommands\\钉钉\\初始化钉钉配置.json"
-    ]
+    "ModuleType": 27
   },
   {
     "ModuleName": "ServerCommandPrivate/订阅钉钉回调事件",
@@ -2675,18 +2666,7 @@
   },
   {
     "ModuleName": "UserService",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2025-04-03T13:31:49.169146+08:00",
-    "ModuleType": 11,
-    "ToRemoveFiles": [
-      "UserServiceDB.sqlite3",
-      "CloudStorageProvider\\data.json",
-      "SecurityProviderV2\\data.json"
-    ]
+    "ModuleType": 11
   },
   {
     "ModuleName": "CustomLibrary",
@@ -2722,16 +2702,7 @@
   },
   {
     "ModuleName": "ServerCommandPrivate/发送钉钉工作日报",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2025-04-03T13:31:04.9375617+08:00",
-    "ModuleType": 27,
-    "ToRemoveFiles": [
-      "ServerCommands\\钉钉\\发送钉钉工作日报.json"
-    ]
+    "ModuleType": 27
   },
   {
     "ModuleName": "ServerCommand/发送钉钉工作日报(页面)",
diff --git a/ServerCommands/钉钉/发送钉钉工作日报.json b/ServerCommands/钉钉/发送钉钉工作日报.json
index e575f219..1f4edabc 100644
--- a/ServerCommands/钉钉/发送钉钉工作日报.json
+++ b/ServerCommands/钉钉/发送钉钉工作日报.json
@@ -16,7 +16,8 @@
               "DataValidationInfo": {
                 "$type": "Forguncy.SaveLoad.DataValidationInfoSaveData, ServerDesignerCommon",
                 "IgnoreBlank": false
-              }
+              },
+              "TestData": "shamus"
             },
             {
               "$type": "Forguncy.SaveLoad.PostRequestParameterSaveData, ServerDesignerCommon",
@@ -181,7 +182,7 @@
                         "$values": [
                           {
                             "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon",
-                            "GUID": "203929d7-3a5f-47e5-acda-a0bbc58bd57a",
+                            "GUID": "d293d43d-ba8c-4c2e-88fb-7f9482601665",
                             "BindingInfo": {
                               "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
                               "TableName": "用户信息视图",
@@ -208,7 +209,7 @@
                               },
                               "Value": {
                                 "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                "SerializeProperty": "=当前用户.组织上级"
+                                "SerializeProperty": "=SUBSTITUTE(当前用户.组织上级,\"|\",\",\")"
                               }
                             },
                             {
@@ -227,7 +228,7 @@
                       },
                       "TopCount": "1"
                     },
-                    "ID": "db3c5e236b054cf5b92bf3fcc4bf6b6f",
+                    "ID": "df2f301f6e024be38b67c7fd59834e1c",
                     "BreakpointIdentity": "149a9ea5-1914-4dcb-bb68-d3f1da9c03fa"
                   },
                   {
@@ -641,7 +642,7 @@
                               }
                             ]
                           },
-                          "ID": "afda366e-e25a-49b0-8dac-88021e628c6e"
+                          "ID": "995312ff-00b2-405c-8041-930cd5894f90"
                         },
                         {
                           "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon",
@@ -656,7 +657,7 @@
                               }
                             ]
                           },
-                          "ID": "1af5c14f-aa05-4cfa-aa67-7c37e3990822"
+                          "ID": "028c894f-a2e8-4661-b2e8-d18ac7253705"
                         }
                       ]
                     },
@@ -664,7 +665,7 @@
                   }
                 ]
               },
-              "ID": "f9d26050-4123-44a0-bcb7-0c069e7ef8c7"
+              "ID": "d52668b5-4705-41f8-a21f-fdd981ea8c75"
             },
             {
               "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon",
@@ -679,7 +680,7 @@
                   }
                 ]
               },
-              "ID": "0a321510-1259-4870-9e62-b2fbb7cb5fc8"
+              "ID": "16f476c6-3150-4746-bf77-7de7653b7e9b"
             }
           ]
         },
diff --git a/UserServiceDB.sqlite3 b/UserServiceDB.sqlite3
index 51e6605fa629ee6eaaf4b23780f5042026e2ecef..6fff0534418dc8d15b7a76bbdf5e6d9b1e45bff4 100644
GIT binary patch
delta 134
zcmZo@P;F>Xoggj9%)r1f1&CpQd7_RnBXeWI)&$07@r>Ei*%KH8I3MyJ=UvU)%A38}
zP=T9wdUY;inUsV98v`RJqpljefuWg+nWd41p@q4Lk)@?Y`|n)F?Z0!G{suC-xBuMF
Y1jNih%mT!$K+Fcj?Aw3t=U{ID0MJe<IRF3v

delta 118
zcmZo@P;F>Xoggj9$iTob1&CpQaiWefBV%L2)&$07@r>2e*%KH8I6v}U=iSXamA87c
zp@KB;^z2;5GA<4SHU>scMqV}c_TRaT+kfXW{S9PvYyY{Q35c12m<5PgftU@5*|-1P
I&%xdR04cjB{r~^~