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 51e6605f..6fff0534 100644 Binary files a/UserServiceDB.sqlite3 and b/UserServiceDB.sqlite3 differ