TRX 1 年間 前
コミット
3f81bc0996

+ 2 - 1
FullCardClient/src/main/java/com/zhongshu/card/client/model/devices/permiss/DevicePermissModel.java

@@ -4,6 +4,7 @@ import com.github.microservice.types.deviceUse.DeviceType;
 import com.zhongshu.card.client.model.base.SuperModel;
 import com.zhongshu.card.client.model.devices.DeviceInfoModel;
 import com.zhongshu.card.client.model.org.DepartmentModel;
+import com.zhongshu.card.client.model.org.DepartmentSimpleModel;
 import com.zhongshu.card.client.model.org.orgUser.OrganizationUserModel;
 import com.zhongshu.card.client.model.org.UserCountSimpleModel;
 import com.zhongshu.card.client.model.org.role.RoleSimpleModel;
@@ -111,7 +112,7 @@ public class DevicePermissModel extends SuperModel {
     private List<RoleSimpleModel> roles = new ArrayList<>();
 
     @Schema(description = "部门信息")
-    private DepartmentModel department;
+    private DepartmentSimpleModel department;
 
     @Schema(description = "用户状态")
     private UserState state = UserState.Normal;

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

@@ -53,6 +53,9 @@ public class OrgUserFaceModel extends SuperModel {
         return "";
     }
 
+    @Schema(description = "人员编码")
+    private String code;
+
     @Schema(description = "用户信息")
     private UserCountSimpleModel userAccount;
 

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

@@ -13,9 +13,9 @@ import com.google.common.collect.Lists;
 import com.zhongshu.card.client.model.base.AuthTypeParam;
 import com.zhongshu.card.client.model.base.UserIdModel;
 import com.zhongshu.card.client.model.org.*;
-import com.zhongshu.card.client.model.org.role.RoleSimpleModel;
 import com.zhongshu.card.client.model.org.orgUser.OrganizationUserModel;
 import com.zhongshu.card.client.model.org.orgUser.OrganizationUserSearch;
+import com.zhongshu.card.client.model.org.role.RoleSimpleModel;
 import com.zhongshu.card.client.model.orgModel.OrgBindUserAllParam;
 import com.zhongshu.card.client.model.school.DictInfoSimpleModel;
 import com.zhongshu.card.client.service.org.UserAccountService;
@@ -739,9 +739,9 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
 
             // 部门信息
             if (ObjectUtils.isNotEmpty(entity.getDepartment())) {
-                DepartmentSimpleModel departmentModel = departmentService.toModel(entity.getDepartment());
+                DepartmentSimpleModel departmentModel = departmentService.toSimpleModel(entity.getDepartment());
                 model.setDepartment(departmentModel);
-                List<DepartmentSimpleModel> departmentModels = departmentService.getParents(entity.getDepartment().getId());
+                List<DepartmentModel> departmentModels = departmentService.getParents(entity.getDepartment().getId());
                 model.setDepartments(departmentModels);
             }
         }
@@ -783,7 +783,7 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
 
             // 部门信息
             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);