diff --git a/.collaboration b/.collaboration index a032b92a..687329bd 100644 --- a/.collaboration +++ b/.collaboration @@ -2346,16 +2346,7 @@ }, { "ModuleName": "ServerCommand/绑定钉钉UnionId", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T22:00:12.7302098+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\绑定钉钉UnionId.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/获取CorpId", @@ -2363,42 +2354,15 @@ }, { "ModuleName": "ServerCommand/解绑钉钉", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T22:03:43.5596865+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\解绑钉钉.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/钉钉授权登录", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T22:04:37.1615608+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\钉钉授权登录.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/dingtalkLogin", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T22:05:28.7782285+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\dingtalkLogin.json" - ] + "ModuleType": 15 }, { "ModuleName": "PCPage/dingtalkLogin", diff --git a/ServerCommands/钉钉/dingtalkLogin.json b/ServerCommands/钉钉/dingtalkLogin.json index 6ff359c6..257ac1e8 100644 --- a/ServerCommands/钉钉/dingtalkLogin.json +++ b/ServerCommands/钉钉/dingtalkLogin.json @@ -61,7 +61,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "091476fe-6eb5-4527-9cda-e8d32077337a", + "GUID": "49a067f4-8cce-4aa1-8de5-932976b66982", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "用户名", @@ -85,7 +85,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "d954848ee70b4bf884e8265e47ec577f" + "ID": "5317369785aa4514bb4dc46d3316a888" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -160,7 +160,7 @@ ] } ], - "ID": "4dd0f710-998d-4ffa-897c-4e8753a5daba" + "ID": "30ce24a4-aedb-4b3d-b253-e7290a56a4eb" }, { "CommandList": [ @@ -179,7 +179,7 @@ ] } ], - "ID": "b243fcc0-0a99-41d0-961d-5c3c12325553" + "ID": "98f5fbb0-aa14-47ad-887d-775faf0658b0" } ] } diff --git a/ServerCommands/钉钉/绑定钉钉UnionId.json b/ServerCommands/钉钉/绑定钉钉UnionId.json index a219d6f9..45cfd045 100644 --- a/ServerCommands/钉钉/绑定钉钉UnionId.json +++ b/ServerCommands/钉钉/绑定钉钉UnionId.json @@ -33,7 +33,7 @@ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "用户名", "ParameterValue": "%CurrentUser%", - "ID": "7293ce1d75204871ae6cf8fe3c8e26e1" + "ID": "a41de320a3be4bb29d7bf34d1c395e69" }, { "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", @@ -89,7 +89,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "859861e5-a372-47ad-a99f-e9d3e3c9b06e", + "GUID": "4f0a2d69-ffbe-45ae-a7db-5488b75f4330", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "用户名", @@ -98,13 +98,22 @@ "ColumnName": "用户名" }, { - "GUID": "e4f5c193-f005-4a55-baa7-caa38b82dec0", + "GUID": "6248259e-e0ed-4ae4-a6ae-590c34dbcbe1", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "全名", "GUID": "92ccdb26-a718-4d80-bef6-9ed36c5a701c" }, "ColumnName": "全名" + }, + { + "GUID": "728f6dae-83c9-4379-a139-d7657263f88a", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "邮件", + "GUID": "9ca07348-4b82-408e-86ce-9043b2156586" + }, + "ColumnName": "邮件" } ], "SqlCondition": { @@ -122,7 +131,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "84b3ab71967c4735889755aac5eaf46d" + "ID": "e522a1e925af4e84bbd04f66a6461c95" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -149,6 +158,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=用户名" }, + "Email": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=已有用户.邮件" + }, "ExtendedProperties": [ { "Name": "DingTalkUnionID", @@ -175,7 +188,7 @@ ] } ], - "ID": "b961632e-9cdd-48ce-b57f-e30e59833172" + "ID": "2d0bac70-629b-4de4-9e97-dc5fa47fd892" }, { "CommandList": [ @@ -213,7 +226,7 @@ ] } ], - "ID": "ec4555e6-d7f1-4263-9dcc-aa6c3fc93535" + "ID": "c9a04d70-a9e7-4365-84c1-a8c68c5c9b23" }, { "CommandList": [ @@ -231,17 +244,17 @@ ] } ], - "ID": "d1739660-72ff-4779-b53a-c7b995dc3086" + "ID": "d35a88ca-bcb7-4757-ace6-051d912b77bb" } ] } ], - "ID": "55264eed-1731-4cbd-8988-61cb8c24111d" + "ID": "9f5ca602-8c4f-43b0-8bd6-b8cd2a6fd4cd" } ] } ], - "ID": "7aad1b9f-da32-452d-b850-85df08483cb4" + "ID": "980da40b-763b-4352-b662-768260554228" }, { "CommandList": [ @@ -262,7 +275,7 @@ ] } ], - "ID": "34ad4114-10c7-400e-8a20-e32f5ed533c3" + "ID": "5afbe41c-4a47-48db-ab44-8231e84b8247" } ] } diff --git a/ServerCommands/钉钉/解绑钉钉.json b/ServerCommands/钉钉/解绑钉钉.json index 44353c98..8d3215be 100644 --- a/ServerCommands/钉钉/解绑钉钉.json +++ b/ServerCommands/钉钉/解绑钉钉.json @@ -31,6 +31,58 @@ } ], "Commands": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "查找用户", + "TableValue": { + "TableName": "用户信息视图", + "TableValueType": 1, + "BindingInfos": [ + { + "GUID": "99fbef36-5d78-449f-a6c4-a6a70be9bcda", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "3c91a8cb-db6d-4266-b5ea-d4a7fa1d8c64" + }, + "ColumnName": "用户名" + }, + { + "GUID": "2f0c6914-5d0b-41bd-a6ae-bfd75c5a00b0", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "邮件", + "GUID": "4a52ac73-b4fe-4f04-ab11-ba5e8c0eef4c" + }, + "ColumnName": "邮件" + }, + { + "GUID": "64a3f7c2-5fc4-4e87-9ac3-52db66257f2a", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "882386d7-0d8e-468d-ae08-55fd17a4f976" + }, + "ColumnName": "全名" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "0dd1ca79-53db-4f0b-9df4-be8aa3ad5a5a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=用户名" + } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "b0195fe17e0f4d4a90eac80c5ed63073" + }, { "$type": "UserManagementCommandsV2.UserManagementCommand, UserManagementCommandsV2", "OperationType": "202", @@ -38,7 +90,15 @@ "$type": "UserManagementCommandsV2.UpdateUserOperator, UserManagementCommandsV2", "UserName": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=用户名" + "SerializeProperty": "=查找用户.用户名" + }, + "FullName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=查找用户.全名" + }, + "Email": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=查找用户.邮件" }, "ExtendedProperties": [ { diff --git a/ServerCommands/钉钉/钉钉授权登录.json b/ServerCommands/钉钉/钉钉授权登录.json index 50df6042..a1ddcb66 100644 --- a/ServerCommands/钉钉/钉钉授权登录.json +++ b/ServerCommands/钉钉/钉钉授权登录.json @@ -48,13 +48,31 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "38bab2f8-693a-431c-8b04-6befe101687c", + "GUID": "0e801573-63c6-4815-ba71-6ececc3d1e7b", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "用户名", "GUID": "37f86a0d-9aa8-4731-8aef-ab55b140fe53" }, "ColumnName": "用户名" + }, + { + "GUID": "16fc5332-f750-43cd-aab2-e63edbe91365", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "25b13193-8f00-4f41-9ad6-3f2e410825ed" + }, + "ColumnName": "全名" + }, + { + "GUID": "6da634f2-4701-4cf0-8a42-63ed109e7d82", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "邮件", + "GUID": "9e3dbcde-f83c-43ec-adbb-ff4b94906832" + }, + "ColumnName": "邮件" } ], "SqlCondition": { @@ -72,7 +90,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "83afb5df01fa4520b302ab0cc912b78c" + "ID": "2e9be2a689684d6588f40934cf71b3f1" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -100,6 +118,14 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=查找用户.用户名" }, + "FullName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=查找用户.全名" + }, + "Email": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=查找用户.邮件" + }, "ExtendedProperties": [ { "Name": "DingTalkUnionID", @@ -139,7 +165,7 @@ ] } ], - "ID": "48ac56d7-0d09-4974-be05-12264d670c4e" + "ID": "96422d9f-da59-4f2d-a70e-ffce00dd48ac" }, { "CommandList": [ @@ -158,7 +184,7 @@ ] } ], - "ID": "2aff1f93-355d-4519-a2a8-36479fd08485" + "ID": "1e7196fc-55e2-4c56-975d-1ca79c10b2c1" } ] }