统一用户管理修复

web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java

@@ -115,7 +115,7 @@ public class CorpInfoQueryExe {
 
     public PageResponse<CorpUserMiddleCO> corpUserMiddlePage(CorpUserMiddleQry qry) {
         Map<String, Object> parmas = PageQueryHelper.toHashMap(qry);
-        PageResponse<CorpInfoDO> pageResponse = corpInfoRepository.listPage(parmas);
+        PageResponse<CorpInfoDO> pageResponse = corpInfoRepository.corpUserMiddlePage(parmas);
         List<CorpUserMiddleCO> examCenterCOS = corpInfoCoConvertor.converDOsToMiddleCOs(pageResponse.getData());
         examCenterCOS.forEach(info->{
             info.setDepartMentCount(departmentRepository.getCountByCorpInfoId(info.getId()));

web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java

@@ -141,9 +141,6 @@ public class UserQueryExe {
             params.put("userIdList", Arrays.asList(ids));
         }
         List<UserDO> userDOList = userRepository.listAll(params);
-        //手机号脱敏
-        //身份照脱敏
-        userDOList.forEach(userDO -> desensitize(userCoConvertor.converDOToCO(userDO)));
         List<UserExcelExportEntity> userExcelExportEntities = userCoConvertor.converDOsToExcelEntitys(userDOList);
         UserE userE  = new UserE();
         userE.exportUserTable(httpServletResponse, userExcelExportEntities);

web-client/src/main/java/com/zcloud/basic/info/dto/CorpDepartmentQry.java

@@ -4,6 +4,8 @@ import com.alibaba.cola.dto.PageQuery;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
+
 
 /**
  * web-client
@@ -35,6 +37,8 @@ public class CorpDepartmentQry extends PageQuery {
 
     @ApiModelProperty(value = "是否启用，1:启用,0:关闭", name = "eqUseFlag")
     private String eqUseFlag;
+    @ApiModelProperty(value = "企业类型1：监管 2：企业 3：相关方", name = "enterpriseType", required = true)
+    private Integer enterpriseType;
 
 
 }

web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpDepartmentE.java

@@ -51,10 +51,11 @@ public class CorpDepartmentE extends ClientObject {
 
 
     public void addDepart(List<DepartmentE> list) {
-        //过滤掉为null的
+        //过滤掉为DepartmentE::getLevel为null的
 
         Map<String, Integer> levelToDepartmentMap = list.stream()
                 .filter(Objects::nonNull)
+                .filter(departmentE -> departmentE.getLevel() != null)
                 .collect(Collectors.groupingBy(
                         DepartmentE::getLevel,
                         Collectors.collectingAndThen(
@@ -62,6 +63,7 @@ public class CorpDepartmentE extends ClientObject {
                                 Long::intValue  // 直接将 Long 转为 Integer
                         )
                 ));
+
         // 部门级别待定
         this.factoryCount =levelToDepartmentMap.get("departmentLevel0001");
         this.sectionCount =levelToDepartmentMap.get("departmentLevel0002");

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpInfoRepository.java

@@ -30,5 +30,6 @@ public interface CorpInfoRepository extends BaseRepository<CorpInfoDO> {
 
     Long checkCorpName(Map<String, Object> parmas);
 
+    PageResponse<CorpInfoDO> corpUserMiddlePage(Map<String, Object> parmas);
 }
 

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java

@@ -169,6 +169,22 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl<CorpInfoMapper, C
         return corpInfoMapper.selectCount(queryWrapper);
     }
 
-
+    @Override
+    public PageResponse<CorpInfoDO> corpUserMiddlePage(Map<String, Object> params) {
+        IPage<CorpInfoDO> iPage = new Query<CorpInfoDO>().getPage(params);
+        QueryWrapper<CorpInfoDO> queryWrapper = new QueryWrapper<>();
+        queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params);
+        if(ObjectUtil.isNotNull(params.get("enterpriseType"))){
+            List<Integer> enterpriseType = CorpTypeEnum.getCodesByEnterpriseType((Integer) params.get("enterpriseType"));
+            if(CollUtil.isNotEmpty(enterpriseType)){
+                queryWrapper.in("type",enterpriseType );
+            }
+        }else{
+            queryWrapper.in("type", CorpTypeEnum.OrdinaryEnterprises.getCode(), CorpTypeEnum.groupUnits.getCode());
+        }
+        queryWrapper.orderByAsc("corp_order").orderByDesc("create_time");
+        IPage<CorpInfoDO> result = corpInfoMapper.selectPage(iPage, queryWrapper);
+        return PageHelper.pageToResponse(result, result.getRecords());
+    }
 }