TRX 1 rok pred
rodič
commit
f5b5d0a3c0

+ 11 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/org/orgUser/OrganizationUserModel.java

@@ -63,6 +63,17 @@ public class OrganizationUserModel extends SuperModel {
     @Schema(description = "审核用户")
     private String reViewUserId;
 
+    private String reViewUserName;
+
+    private UserCountSimpleModel reViewUser;
+
+    public String getReViewUserName() {
+        if (reViewUser != null) {
+            return reViewUser.getName();
+        }
+        return "";
+    }
+
     @Schema(description = "审核时间")
     private Long reViewTime;
 

+ 3 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/user/UserAccountServiceImpl.java

@@ -771,6 +771,9 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
                 List<DepartmentModel> departmentModels = departmentService.getParents(entity.getDepartment().getId());
                 model.setDepartments(departmentModels);
             }
+            if (StringUtils.isNotEmpty(entity.getReViewUserId())) {
+                model.setReViewUser(toSimpleModel(entity.getReViewUserId()));
+            }
         }
         return model;
     }