Browse Source

更新!

TRX 1 năm trước cách đây
mục cha
commit
b084b67c5b

+ 14 - 1
FullCardClient/src/main/java/com/zhongshu/card/client/model/projectAbout/orgFace/OrgUserFaceModel.java

@@ -1,14 +1,15 @@
 package com.zhongshu.card.client.model.projectAbout.orgFace;
 
 import com.zhongshu.card.client.model.base.SuperModel;
-import com.zhongshu.card.client.model.org.orgUser.OrganizationUserSimpleModel;
 import com.zhongshu.card.client.model.org.UserCountSimpleModel;
+import com.zhongshu.card.client.model.org.orgUser.OrganizationUserSimpleModel;
 import com.zhongshu.card.client.type.Sex;
 import com.zhongshu.card.client.type.common.AuditState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
 
 /**
  * @author TRX
@@ -76,6 +77,18 @@ public class OrgUserFaceModel extends SuperModel {
     @Schema(description = "审核用户userId")
     private String auditUserId;
 
+    private String auditUserName;
+
+    public String getAuditUserName() {
+        if (ObjectUtils.isNotEmpty(auditUserAccount)) {
+            return auditUserAccount.getName();
+        }
+        return "";
+    }
+
+    @Schema(description = "审核用户")
+    private UserCountSimpleModel auditUserAccount;
+
     @Schema(description = "审核备注")
     private String auditRemark;
 

+ 1 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/projectAbout/OrgUserFaceService.java

@@ -419,6 +419,7 @@ public class OrgUserFaceService extends SuperService {
             BeanUtils.copyProperties(entity, model);
             model.setUserAccount(userAccountService.toSimpleDesenModel(entity.getUserAccount()));
             model.setOrganizationUser(organizationUserServiceImpl.toModel(entity.getOrganizationUser()));
+            model.setAuditUserAccount(userAccountService.toSimpleModel(entity.getAuditUserId()));
         }
         return model;
     }

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

@@ -680,6 +680,14 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
         return model;
     }
 
+    public UserCountSimpleModel toSimpleModel(String userId) {
+        if (StringUtils.isEmpty(userId)) {
+            return null;
+        }
+        UserAccount userAccount = userCountDao.findTopByUserId(userId);
+        return toSimpleModel(userAccount);
+    }
+
     /**
      * 用户的基本信息 (简介模型)
      *