Browse Source

更新用户创建信息和部门名称处理

在 `GroupsController.cs` 中移除 `CreateTime` 字段,添加 `CreateUserName` 字段,并更新查询以包含新字段。增加对 `CreateUserId` 的左连接,以获取创建用户名称。同时,遍历 `groupList` 为每个项目的 `Department` 属性赋值。

在 `DelegationInfoView.cs` 中新增 `CreateUserName` 属性,以便在视图模型中包含创建用户的名称。
LEIYI 2 months ago
parent
commit
732f31e738

+ 5 - 2
OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -1230,7 +1230,7 @@ SELECT
   JietuanOperatorId,
   JietuanOperator,
   IsSure,
-  CreateTime,
+  CreateUserName,
   IsBid
 FROM
   (
@@ -1255,13 +1255,15 @@ FROM
       JietuanOperator JietuanOperatorId,
       su.CnName JietuanOperator,
       IsSure,
-      gdi.CreateTime,
+	  gdi.CreateTime,
+      su1.CnName As CreateUserName,
       gdi.IsBid
     FROM
       Grp_DelegationInfo gdi
       LEFT JOIN Sys_SetData ssd ON gdi.TeamDid = ssd.Id
       LEFT JOIN Sys_SetData ssd1 ON gdi.TeamLevSId = ssd1.Id
       LEFT JOIN Sys_Users su ON gdi.JietuanOperator = su.Id
+      LEFT JOIN Sys_Users su1 ON gdi.CreateUserId = su1.Id
     WHERE
       gdi.IsDel = 0
       AND gdi.IsBid = 0
@@ -1304,6 +1306,7 @@ FROM
                 })
                 .ToList();
 
+
             foreach (var item in groupList)
             {
                 item.Department = userDepDatas.Find(it => item.JietuanOperatorId == it.UserId)?.DepName ?? "Unknown";

+ 2 - 0
OASystem/OASystem.Domain/ViewModels/Groups/DelegationInfoView.cs

@@ -498,6 +498,8 @@ namespace OASystem.Domain.ViewModels.Groups
         public DateTime CreateTime { get; set; }
 
         public string GroupFirst { get; set; }
+
+        public string CreateUserName { get; set; }
     }