From 7fd42a823787737a0e0eafc2a1b7bfe853e68d10 Mon Sep 17 00:00:00 2001 From: cuckooent Date: Wed, 4 Sep 2024 22:24:13 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"1","MessageType":2,"Modules":[{"Sta?= =?UTF-8?q?te":1,"Type":15,"Name":"ServerCommand/=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E9=92=89=E9=92=89UnionId"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 11 +-- ServerCommands/钉钉/绑定钉钉UnionId.json | 86 ++++++++++++++++++------ 2 files changed, 67 insertions(+), 30 deletions(-) diff --git a/.collaboration b/.collaboration index 9b645326..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:17:25.9935811+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\绑定钉钉UnionId.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/获取CorpId", diff --git a/ServerCommands/钉钉/绑定钉钉UnionId.json b/ServerCommands/钉钉/绑定钉钉UnionId.json index 45cfd045..e1d251c9 100644 --- a/ServerCommands/钉钉/绑定钉钉UnionId.json +++ b/ServerCommands/钉钉/绑定钉钉UnionId.json @@ -29,12 +29,6 @@ } ], "Commands": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "用户名", - "ParameterValue": "%CurrentUser%", - "ID": "a41de320a3be4bb29d7bf34d1c395e69" - }, { "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", "ServerCommandName": "通过免登码获取用户信息", @@ -89,7 +83,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "4f0a2d69-ffbe-45ae-a7db-5488b75f4330", + "GUID": "44989b75-dedf-4e91-943d-176b84d6f9dd", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "用户名", @@ -98,7 +92,7 @@ "ColumnName": "用户名" }, { - "GUID": "6248259e-e0ed-4ae4-a6ae-590c34dbcbe1", + "GUID": "78647681-5f69-4e40-93c9-52e10929f4fb", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "全名", @@ -107,7 +101,7 @@ "ColumnName": "全名" }, { - "GUID": "728f6dae-83c9-4379-a139-d7657263f88a", + "GUID": "369ff097-edf3-47f2-925e-412924a04985", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "邮件", @@ -131,7 +125,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "e522a1e925af4e84bbd04f66a6461c95" + "ID": "32cef9836a0944aaa6e974d75fb07fc6" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -149,6 +143,54 @@ "value": "%Null%" }, "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "当前用户", + "TableValue": { + "TableName": "用户信息视图", + "TableValueType": 1, + "BindingInfos": [ + { + "GUID": "5c0c1a15-446f-4d4a-aa1a-da59e7ec42f9", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "0d50e533-5587-4fdb-9617-9fd8c2c5243b" + }, + "ColumnName": "用户名" + }, + { + "GUID": "c3b7f26c-800e-428c-8708-ea57f942cc8a", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "7c941dda-663b-49c1-9bdc-d5f63ee8df29" + }, + "ColumnName": "全名" + }, + { + "GUID": "05b1fd1f-46eb-405c-bb06-83b85ad8e8c3", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "邮件", + "GUID": "363e8f14-1d97-4ad9-92b9-9d58cea20f2f" + }, + "ColumnName": "邮件" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "c8d2347a-55a2-479f-aa60-02d29a984d65" + }, + "Value": "%CurrentUser%" + }, + "TopCount": "1" + }, + "ID": "b14087ed527f4c52af859ed15f100fdb" + }, { "$type": "UserManagementCommandsV2.UserManagementCommand, UserManagementCommandsV2", "OperationType": "202", @@ -156,11 +198,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": "=已有用户.邮件" + "SerializeProperty": "=当前用户.邮件" }, "ExtendedProperties": [ { @@ -188,7 +234,7 @@ ] } ], - "ID": "2d0bac70-629b-4de4-9e97-dc5fa47fd892" + "ID": "c64bbee5-ab11-4033-892f-0441fe2d7faa" }, { "CommandList": [ @@ -207,7 +253,7 @@ }, "value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=用户名" + "SerializeProperty": "=当前用户" } }, "CommandList": [ @@ -226,13 +272,13 @@ ] } ], - "ID": "c9a04d70-a9e7-4365-84c1-a8c68c5c9b23" + "ID": "78b4fa6c-a0e2-4ebb-b351-bcf30798ce44" }, { "CommandList": [ { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "0", + "ErrorCode": "400", "Message": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=\"当前钉钉账号已被\"&已有用户.全名&\"的账号绑定，请先解绑后再试！\"" @@ -244,17 +290,17 @@ ] } ], - "ID": "d35a88ca-bcb7-4757-ace6-051d912b77bb" + "ID": "29f2d4cc-7ec2-4aff-81dc-33e4fcf656ee" } ] } ], - "ID": "9f5ca602-8c4f-43b0-8bd6-b8cd2a6fd4cd" + "ID": "b1533ed2-d7cb-4c1b-8c36-7b5ff67c27d8" } ] } ], - "ID": "980da40b-763b-4352-b662-768260554228" + "ID": "d697972d-1bee-41d6-9eb8-fa626cfe167b" }, { "CommandList": [ @@ -275,7 +321,7 @@ ] } ], - "ID": "5afbe41c-4a47-48db-ab44-8231e84b8247" + "ID": "bc8268c4-6832-4239-b690-657de19635cb" } ] }