更新！

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/DepartmentSimpleModel.java

@@ -0,0 +1,36 @@
+package com.zhongshu.card.client.model.org;
+
+import com.zhongshu.card.client.model.base.SuperModel;
+import com.zhongshu.card.client.type.DataState;
+import com.zhongshu.card.client.utils.ITree;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author TRX
+ * @date 2024/6/3
+ */
+@Data
+public class DepartmentSimpleModel implements ITree<DepartmentSimpleModel>, Serializable {
+
+    private String id;
+
+    @Schema(description = "部门名称")
+    private String name;
+
+    @Schema(description = "部门编码")
+    private String code;
+
+    @Schema(description = "部门状态")
+    private DataState state = DataState.Enable;
+
+    @Schema(description = "上级ID")
+    private String parentId;
+
+    @Schema(description = "子层级")
+    private List<DepartmentSimpleModel> children = new ArrayList<>();
+}

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/orgUser/OrganizationUserModel.java

@@ -3,6 +3,7 @@ package com.zhongshu.card.client.model.org.orgUser;
 import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.card.client.model.base.SuperModel;
 import com.zhongshu.card.client.model.org.DepartmentModel;
+import com.zhongshu.card.client.model.org.DepartmentSimpleModel;
 import com.zhongshu.card.client.model.org.OrganizationMiniModel;
 import com.zhongshu.card.client.model.org.UserCountSimpleModel;
 import com.zhongshu.card.client.model.org.role.RoleSimpleModel;
@@ -224,7 +225,7 @@ public class OrganizationUserModel extends SuperModel {
     }
 
     @Schema(description = "部门信息")
-    private DepartmentModel department;
+    private DepartmentSimpleModel department;
 
     @Schema(description = "部门名称")
     private String departmentName;

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/orgUser/OrganizationUserSimpleModel.java

@@ -1,6 +1,7 @@
 package com.zhongshu.card.client.model.org.orgUser;
 
 import com.zhongshu.card.client.model.org.DepartmentModel;
+import com.zhongshu.card.client.model.org.DepartmentSimpleModel;
 import com.zhongshu.card.client.model.org.role.RoleModel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
@@ -48,7 +49,7 @@ public class OrganizationUserSimpleModel {
     private List<RoleModel> roles = new ArrayList<>();
 
     @Schema(description = "部门信息")
-    private DepartmentModel department;
+    private DepartmentSimpleModel department;
 
     @Schema(description = "部门信息所有级")
     private List<DepartmentModel> departments = new ArrayList<>();

FullCardClient/src/main/java/com/zhongshu/card/client/model/projectAbout/orgFace/OrgUserFaceModel.java

@@ -3,6 +3,7 @@ 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.type.Sex;
 import com.zhongshu.card.client.type.common.AuditState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
@@ -40,6 +41,18 @@ public class OrgUserFaceModel extends SuperModel {
     @Schema(description = "用户电话")
     private String phone;
 
+    @Schema(description = "性别")
+    private Sex sex;
+
+    private String sexStr;
+
+    public String getSexStr() {
+        if (sex != null) {
+            return sex.getRemark();
+        }
+        return "";
+    }
+
     @Schema(description = "用户信息")
     private UserCountSimpleModel userAccount;
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/OrganizationUserServiceImpl.java

@@ -1128,7 +1128,7 @@ public class OrganizationUserServiceImpl extends SuperService {
 
             // 部门信息
             if (ObjectUtils.isNotEmpty(entity.getDepartment())) {
-                DepartmentModel departmentModel = departmentService.toModel(entity.getDepartment());
+                DepartmentSimpleModel departmentModel = departmentService.toSimpleModel(entity.getDepartment());
                 model.setDepartment(departmentModel);
                 List<DepartmentModel> departmentModels = departmentService.getParents(entity.getDepartment().getId());
                 model.setDepartments(departmentModels);

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/user/DepartmentServiceImpl.java

@@ -1,14 +1,15 @@
 package com.zhongshu.card.server.core.service.user;
 
-import com.zhongshu.card.client.model.org.DepartmentModel;
-import com.zhongshu.card.client.model.org.DepartmentParam;
 import com.github.microservice.net.ResultContent;
 import com.github.microservice.net.ResultMessage;
+import com.zhongshu.card.client.model.org.DepartmentModel;
+import com.zhongshu.card.client.model.org.DepartmentParam;
+import com.zhongshu.card.client.model.org.DepartmentSimpleModel;
 import com.zhongshu.card.client.model.org.OidAboutInfo;
 import com.zhongshu.card.client.service.org.DepartmentService;
+import com.zhongshu.card.client.type.DataState;
 import com.zhongshu.card.client.utils.ITree;
 import com.zhongshu.card.client.utils.TreeUtil;
-import com.zhongshu.card.client.type.DataState;
 import com.zhongshu.card.server.core.dao.org.DepartmentDao;
 import com.zhongshu.card.server.core.domain.org.Department;
 import com.zhongshu.card.server.core.domain.org.Organization;
@@ -19,7 +20,6 @@ import com.zhongshu.card.server.core.util.CommonUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.kafka.common.protocol.types.Field;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -201,4 +201,14 @@ public class DepartmentServiceImpl extends SuperService implements DepartmentSer
         }
         return model;
     }
+
+    public DepartmentSimpleModel toSimpleModel(Department entity) {
+        DepartmentSimpleModel model = null;
+        if (ObjectUtils.isNotEmpty(entity)) {
+            model = new DepartmentSimpleModel();
+            BeanUtils.copyProperties(entity, model);
+        }
+        return model;
+    }
+
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/user/UserAccountServiceImpl.java

@@ -739,9 +739,9 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
 
             // 部门信息
             if (ObjectUtils.isNotEmpty(entity.getDepartment())) {
-                DepartmentModel departmentModel = departmentService.toModel(entity.getDepartment());
+                DepartmentSimpleModel departmentModel = departmentService.toModel(entity.getDepartment());
                 model.setDepartment(departmentModel);
-                List<DepartmentModel> departmentModels = departmentService.getParents(entity.getDepartment().getId());
+                List<DepartmentSimpleModel> departmentModels = departmentService.getParents(entity.getDepartment().getId());
                 model.setDepartments(departmentModels);
             }
         }