From 8bb9505af705cb6f218712b3ba3d38520b746a45 Mon Sep 17 00:00:00 2001 From: zuohuaijun Date: Fri, 12 Jul 2024 14:23:28 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=98=8E=E6=8F=92=E4=BB=B6=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E4=BB=A3=E7=A0=81=E5=90=8C=E6=AD=A5=E4=B8=8E=E6=B8=85?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Plugins/Admin.NET.Plugin.DingTalk/Const/DingTalkConst.cs | 2 ++ .../Plugins/Admin.NET.Plugin.DingTalk/Entity/DingTalkUser.cs | 4 +++- .../Admin.NET.Plugin.DingTalk/Service/DingTalkService.cs | 4 ++-- Admin.NET/Plugins/Admin.NET.Plugin.GoView/Entity/GoViewPro.cs | 3 ++- .../Plugins/Admin.NET.Plugin.GoView/Entity/GoViewProData.cs | 1 + 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.DingTalk/Const/DingTalkConst.cs b/Admin.NET/Plugins/Admin.NET.Plugin.DingTalk/Const/DingTalkConst.cs index 9df79af4..4547390e 100644 --- a/Admin.NET/Plugins/Admin.NET.Plugin.DingTalk/Const/DingTalkConst.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.DingTalk/Const/DingTalkConst.cs @@ -36,10 +36,12 @@ public class DingTalkConst /// 主部门Id /// public const string DeptId = "sys00-mainDeptId"; + /// /// 主部门 /// public const string Dept = "sys00-mainDept"; + /// /// 职位 /// diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.DingTalk/Entity/DingTalkUser.cs b/Admin.NET/Plugins/Admin.NET.Plugin.DingTalk/Entity/DingTalkUser.cs index fee3251c..fe2f0137 100644 --- a/Admin.NET/Plugins/Admin.NET.Plugin.DingTalk/Entity/DingTalkUser.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.DingTalk/Entity/DingTalkUser.cs @@ -73,23 +73,25 @@ public class DingTalkUser : EntityBase [SugarColumn(ColumnDescription = "工号", Length = 16)] [MaxLength(16)] public string? JobNumber { get; set; } + /// /// 主部门Id /// [SugarColumn(ColumnDescription = "主部门Id", Length = 16)] [MaxLength(16)] public string? DeptId { get; set; } + /// /// 主部门 /// [SugarColumn(ColumnDescription = "主部门", Length = 16)] [MaxLength(16)] public string? Dept { get; set; } + /// /// 职位 /// [SugarColumn(ColumnDescription = "职位", Length = 16)] [MaxLength(16)] public string? Position { get; set; } - } \ No newline at end of file diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.DingTalk/Service/DingTalkService.cs b/Admin.NET/Plugins/Admin.NET.Plugin.DingTalk/Service/DingTalkService.cs index 02322eda..71365f0c 100644 --- a/Admin.NET/Plugins/Admin.NET.Plugin.DingTalk/Service/DingTalkService.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.DingTalk/Service/DingTalkService.cs @@ -43,7 +43,7 @@ public class DingTalkService : IDynamicApiController, IScoped /// /// /// - [DisplayName("获取在职员工列表")] + [HttpPost, DisplayName("获取在职员工列表")] public async Task> GetDingTalkCurrentEmployeesList(string access_token, [Required] GetDingTalkCurrentEmployeesListInput input) { return await _dingTalkApi.GetDingTalkCurrentEmployeesList(access_token, input); @@ -55,7 +55,7 @@ public class DingTalkService : IDynamicApiController, IScoped /// /// /// - [DisplayName("获取员工花名册字段信息")] + [HttpPost, DisplayName("获取员工花名册字段信息")] public async Task>> GetDingTalkCurrentEmployeesRosterList(string access_token, [Required] GetDingTalkCurrentEmployeesRosterListInput input) { return await _dingTalkApi.GetDingTalkCurrentEmployeesRosterList(access_token, input); diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.GoView/Entity/GoViewPro.cs b/Admin.NET/Plugins/Admin.NET.Plugin.GoView/Entity/GoViewPro.cs index 023d5c9b..0594ca67 100644 --- a/Admin.NET/Plugins/Admin.NET.Plugin.GoView/Entity/GoViewPro.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.GoView/Entity/GoViewPro.cs @@ -1,4 +1,4 @@ -// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。 +// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。 // // 本项目主要遵循 MIT 许可证和 Apache 许可证(版本 2.0)进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。 // @@ -10,6 +10,7 @@ namespace Admin.NET.Plugin.GoView; /// GoView 项目表 /// [SugarTable(null, "GoView 项目表")] +[SysTable] public class GoViewPro : EntityTenant { /// diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.GoView/Entity/GoViewProData.cs b/Admin.NET/Plugins/Admin.NET.Plugin.GoView/Entity/GoViewProData.cs index a792c033..ab5bd036 100644 --- a/Admin.NET/Plugins/Admin.NET.Plugin.GoView/Entity/GoViewProData.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.GoView/Entity/GoViewProData.cs @@ -10,6 +10,7 @@ namespace Admin.NET.Plugin.GoView; /// GoView 项目数据表 /// [SugarTable(null, "GoView 项目数据表")] +[SysTable] public class GoViewProData : EntityTenant { ///