TRX hai 1 ano
pai
achega
40e259650f

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

@@ -20,6 +20,7 @@ public class OrganizationUserAuditParam {
     @Schema(description = "数据id")
     private String id;
 
+    @Schema(description = "数据id集合")
     private List<String> ids = new ArrayList<>();
 
     @NotNull

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

@@ -250,5 +250,6 @@ public class OrganizationUserModel extends SuperModel {
     }
 
     @Schema(description = "部门信息所有级")
-    private List<DepartmentModel> departments = new ArrayList<>();
+    private List<DepartmentSimpleModel> departments = new ArrayList<>();
+
 }

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

@@ -54,7 +54,7 @@ public class OrganizationUserSimpleModel {
     private DepartmentSimpleModel department;
 
     @Schema(description = "部门信息所有级")
-    private List<DepartmentModel> departments = new ArrayList<>();
+    private List<DepartmentSimpleModel> departments = new ArrayList<>();
 
     @Schema(description = "职位")
     private DictInfoSimpleModel position;

+ 2 - 1
FullCardClient/src/main/java/com/zhongshu/card/client/service/org/DepartmentService.java

@@ -3,6 +3,7 @@ package com.zhongshu.card.client.service.org;
 import com.github.microservice.net.ResultContent;
 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.utils.ITree;
 
 import java.util.List;
@@ -18,7 +19,7 @@ public interface DepartmentService {
     ResultContent<List<ITree>> getDepartmentTree(String oid);
 
     // 查询所有上级部门
-    List<DepartmentModel> getParents(String id);
+    List<DepartmentSimpleModel> getParents(String id);
 
     // 删除部门
     ResultContent deleteDepartment(String id);

+ 1 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/org/impl/OrganizationUserDaoImpl.java

@@ -79,7 +79,7 @@ public class OrganizationUserDaoImpl extends BaseImpl implements OrganizationUse
             criteria.and("state").is(param.getState());
         }
 
-        // 用户加入状态
+        // 用户加入状态(审核状态)
         if (param.getOrgUserState() != null) {
             criteria.and("orgUserState").is(param.getOrgUserState());
         }

+ 2 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/OrganizationUserServiceImpl.java

@@ -1151,7 +1151,8 @@ public class OrganizationUserServiceImpl extends SuperService {
             if (ObjectUtils.isNotEmpty(entity.getDepartment())) {
                 DepartmentSimpleModel departmentModel = departmentService.toSimpleModel(entity.getDepartment());
                 model.setDepartment(departmentModel);
-                List<DepartmentModel> departmentModels = departmentService.getParents(entity.getDepartment().getId());
+
+                List<DepartmentSimpleModel> departmentModels = departmentService.getParents(entity.getDepartment().getId());
                 model.setDepartments(departmentModels);
             }
             model.setPosition(dictInfoService.toSimpleModel(entity.getPosition()));

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

@@ -171,10 +171,10 @@ public class DepartmentServiceImpl extends SuperService implements DepartmentSer
      * @param id
      * @return
      */
-    public List<DepartmentModel> getParents(String id) {
+    public List<DepartmentSimpleModel> getParents(String id) {
         List<Department> list = new ArrayList<>();
         loopLoad(id, list);
-        List<DepartmentModel> models = list.stream().map(this::toModel).collect(Collectors.toList());
+        List<DepartmentSimpleModel> models = list.stream().map(this::toSimpleModel).collect(Collectors.toList());
         if (ObjectUtils.isNotEmpty(models)) {
             Collections.reverse(models);
         }

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

@@ -768,7 +768,8 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
             if (ObjectUtils.isNotEmpty(entity.getDepartment())) {
                 DepartmentSimpleModel departmentModel = departmentService.toSimpleModel(entity.getDepartment());
                 model.setDepartment(departmentModel);
-                List<DepartmentModel> departmentModels = departmentService.getParents(entity.getDepartment().getId());
+
+                List<DepartmentSimpleModel> departmentModels = departmentService.getParents(entity.getDepartment().getId());
                 model.setDepartments(departmentModels);
             }
             if (StringUtils.isNotEmpty(entity.getReViewUserId())) {
@@ -815,7 +816,8 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
             if (ObjectUtils.isNotEmpty(entity.getDepartment())) {
                 DepartmentSimpleModel departmentModel = departmentService.toSimpleModel(entity.getDepartment());
                 model.setDepartment(departmentModel);
-                List<DepartmentModel> departmentModels = departmentService.getParents(entity.getDepartment().getId());
+
+                List<DepartmentSimpleModel> departmentModels = departmentService.getParents(entity.getDepartment().getId());
                 model.setDepartments(departmentModels);
             }
         }