From af9b0f4b52c5ed3cf0a5fbe7191c83c7c0e917b9 Mon Sep 17 00:00:00 2001 From: SondonYong Date: Mon, 10 Nov 2025 18:19:27 +0800 Subject: [PATCH] =?UTF-8?q?dev:=E4=BA=BA=E5=91=98=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/basic/info/command/UserAddExe.java | 34 ++--- .../com/zcloud/basic/info/dto/PostAddCmd.java | 4 +- .../zcloud/basic/info/dto/PostListQry.java | 2 +- .../zcloud/basic/info/dto/PostPageQry.java | 2 +- .../zcloud/basic/info/dto/PostRemoveCmd.java | 2 +- .../zcloud/basic/info/dto/PostUpdateCmd.java | 4 +- .../info/dto/UserQualificationInfoAddCmd.java | 2 +- .../dto/UserQualificationInfoPageQry.java | 3 +- .../dto/UserQualificationInfoUpdateCmd.java | 2 +- .../zcloud/basic/info/domain/model/UserE.java | 124 +++++++++++++++++- .../info/gatewayimpl/PostGatewayImpl.java | 7 + .../repository/DepartmentRepository.java | 2 + .../repository/PostRepository.java | 3 + .../repository/UserRepository.java | 2 + .../impl/DepartmentRepositoryImpl.java | 8 ++ .../repository/impl/PostRepositoryImpl.java | 9 ++ .../UserQualificationInfoRepositoryImpl.java | 7 + .../repository/impl/UserRepositoryImpl.java | 8 ++ 18 files changed, 193 insertions(+), 32 deletions(-) diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java index 91110a9..0446f0c 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java @@ -1,6 +1,7 @@ package com.zcloud.basic.info.command; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; import com.alibaba.cola.exception.BizException; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jjb.saas.config.client.dicttree.facade.ConfDictTreeFacade; @@ -35,7 +36,10 @@ import org.springframework.util.ObjectUtils; import org.springframework.web.multipart.MultipartFile; import java.util.Collections; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** @@ -123,30 +127,26 @@ public class UserAddExe { UserE userE = new UserE(); Long corpinfoId = AuthContext.getTenantId(); - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("corpinfo_id", corpinfoId); - queryWrapper.eq("delete_enum", "FALSE"); - // 部门数据 - List departmentDOList = departmentRepository.list(queryWrapper); - List departmentEList = BeanUtil.copyToList(departmentDOList, DepartmentE.class); + List departmentDOList = departmentRepository.listByCorpInfoId(corpinfoId); // 岗位数据 - List postDOList = postRepository.list(queryWrapper); - List postEList = BeanUtil.copyToList(postDOList, PostE.class); - queryWrapper.clear(); + List postDOList = postRepository.listByCorpInfoId(corpinfoId); // 用户名数据 - queryWrapper.eq("delete_enum", "FALSE"); - List userDOList = userRepository.list(queryWrapper); - List userEList = BeanUtil.copyToList(userDOList, UserE.class); + List userDOList = userRepository.listByCorpInfoId(corpinfoId); // 企业端-人员类型字典 List confDictCOList = confDictTreeFacade.listByAppKeyAndParentIdTree("0bb989ecada5470c87635018ece9f327", 1986379731994513408L); -// if(CollectionUtil) + Map dictMap = new HashMap<>(); + if(CollectionUtil.isNotEmpty(confDictCOList)){ + dictMap = confDictCOList.stream().collect(Collectors.toMap(ConfDictTreeCO::getDictLabel, ConfDictTreeCO::getDictValue)); + } - - List userExcelImportEntityList = userE.parseImportTemplateData(file); - List userDOS = userCoConvertor.converExcelEntitysToDOs(userExcelImportEntityList); + List userEList = userE.parseImportTemplateData(file, + BeanUtil.copyToList(departmentDOList, DepartmentE.class), + BeanUtil.copyToList(postDOList, PostE.class), + BeanUtil.copyToList(userDOList, UserE.class), + dictMap); // todo 批量插入用户 - + System.out.println(userEList); } } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/PostAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/PostAddCmd.java index 0bad35d..67f13f9 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/PostAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/PostAddCmd.java @@ -21,7 +21,7 @@ import javax.validation.constraints.*; @AllArgsConstructor public class PostAddCmd extends Command { @ApiModelProperty(value = "部门id", name = "departmentId", required = true) - @NotEmpty(message = "部门id不能为空") + @NotNull(message = "部门id不能为空") private Long departmentId; @ApiModelProperty(value = "岗位名称", name = "postName", required = true) @@ -33,11 +33,9 @@ public class PostAddCmd extends Command { private String remarks; @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true) - @NotEmpty(message = "企业id不能为空") private Long corpinfoId; @ApiModelProperty(value = "企业名称", name = "corpinfoName", required = true) - @NotEmpty(message = "企业名称不能为空") private String corpinfoName; // @ApiModelProperty(value = "是否监管岗位 0-否, 1-是", name = "supervisionFlag") diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/PostListQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/PostListQry.java index 91032ad..bb0b700 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/PostListQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/PostListQry.java @@ -37,7 +37,7 @@ public class PostListQry { private Long[] postIds; @ApiModelProperty(value = "部门id", name = "departmentId", required = true) - @NotEmpty(message = "部门id不能为空") + @NotNull(message = "部门id不能为空") // 部门id private Long departmentId; diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/PostPageQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/PostPageQry.java index e44204f..5a31460 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/PostPageQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/PostPageQry.java @@ -34,7 +34,7 @@ public class PostPageQry extends PageQuery { private Integer corpFlag; @ApiModelProperty(value = "部门id", name = "eqDepartmentId", required = true) - @NotEmpty(message = "部门id不能为空") + @NotNull(message = "部门id不能为空") // 部门id private Long eqDepartmentId; diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/PostRemoveCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/PostRemoveCmd.java index 02a2805..bbab5d7 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/PostRemoveCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/PostRemoveCmd.java @@ -22,7 +22,7 @@ import javax.validation.constraints.*; public class PostRemoveCmd extends Command { @ApiModelProperty(value = "主键", name = "ids", required = true) - @NotEmpty(message = "主键不能为空") + @NotNull(message = "主键不能为空") private Long[] ids; } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/PostUpdateCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/PostUpdateCmd.java index 45c8fb8..6d3cdcf 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/PostUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/PostUpdateCmd.java @@ -21,11 +21,11 @@ import javax.validation.constraints.*; @AllArgsConstructor public class PostUpdateCmd extends Command { @ApiModelProperty(value = "主键", name = "id", required = true) - @NotEmpty(message = "主键不能为空") + @NotNull(message = "主键不能为空") private Long id; @ApiModelProperty(value = "部门id", name = "departmentId", required = true) - @NotEmpty(message = "部门id不能为空") + @NotNull(message = "部门id不能为空") private Long departmentId; @ApiModelProperty(value = "岗位名称", name = "postName", required = true) diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoAddCmd.java index 4c4a5c6..9c2ff27 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoAddCmd.java @@ -26,7 +26,7 @@ public class UserQualificationInfoAddCmd extends Command { private Long corpinfoId; @ApiModelProperty(value = "用户id", name = "userId", required = true) - @NotEmpty(message = "用户id不能为空") + @NotNull(message = "用户id不能为空") private Long userId; @ApiModelProperty(value = "资质名称", name = "qualificationName", required = true) diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoPageQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoPageQry.java index 2fad3ac..babb28d 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoPageQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoPageQry.java @@ -28,8 +28,7 @@ public class UserQualificationInfoPageQry extends PageQuery { * - `le`: 小于等于比较查询 * - `ne`: 不等比较查询，对应SQL的!=操作符 */ - @ApiModelProperty(value = "企业id", name = "eqCorpinfoId", required = true) - @NotEmpty(message = "企业id不能为空") + @ApiModelProperty(value = "企业id", name = "eqCorpinfoId") private Long eqCorpinfoId; @ApiModelProperty(value = "用户id", name = "eqUserId") diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoUpdateCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoUpdateCmd.java index 6a04129..f63cbdb 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoUpdateCmd.java @@ -30,7 +30,7 @@ public class UserQualificationInfoUpdateCmd extends Command { private String userQualificationinfoId; @ApiModelProperty(value = "用户id", name = "userId", required = true) - @NotEmpty(message = "用户id不能为空") + @NotNull(message = "用户id不能为空") private Long userId; @ApiModelProperty(value = "资质名称", name = "qualificationName", required = true) diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java index d3e4c54..1c2f1ec 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java @@ -11,13 +11,17 @@ import com.zcloud.gbscommon.utils.ExcelUtils; import com.zcloud.gbscommon.utils.Tools; import com.zcloud.gbscommon.utils.UuidUtil; import lombok.Data; +import org.apache.commons.lang.StringUtils; import org.springframework.util.ObjectUtils; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.time.LocalDateTime; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * web-domain @@ -178,7 +182,11 @@ public class UserE extends BaseE { } // 导入 - public List parseImportTemplateData(MultipartFile file){ + public List parseImportTemplateData(MultipartFile file, + List departmentList, + List postList, + List userList, + Map dictMap) { List list = new ArrayList<>(); try { ExcelUtils.readBatch(file, UserExcelImportEntity.class, list); @@ -188,12 +196,122 @@ public class UserE extends BaseE { } catch (Exception e) { throw new BizException("文件解析失败"); } - // todo 校验 + + if(CollUtil.isEmpty(departmentList)){ + throw new BizException("该企业暂未存在部门信息，请添加部门后重新导入"); + } + if(CollUtil.isEmpty(postList)){ + throw new BizException("该企业暂未存在岗位信息，请添加岗位后重新导入"); + } + Map departmentEMap = departmentList.stream().collect(Collectors.toMap(DepartmentE::getName, DepartmentE -> DepartmentE)); + + + Map userEMap = new HashMap<>(); + if(CollUtil.isNotEmpty(userList)){ + userEMap = userList.stream().collect(Collectors.toMap(UserE::getUsername, UserE -> UserE)); + } + + Map usernameMap = new HashMap<>(); + + + // 错误消息集合 + List errList = new ArrayList<>(); + // 校验 for (int i = 0; i < list.size(); i++) { UserExcelImportEntity entity = list.get(i); + if(entity == null){ + errList.add("第" + (i+2) + "行数据不能为空。"); + continue; + } + if(StringUtils.isEmpty(entity.getRoleName())){ + errList.add("第" + (i+2) + "行用户角色不能为空。"); + } + if(StringUtils.isEmpty(entity.getDepartmentName())){ + errList.add("第" + (i+2) + "行所属部门不能为空。"); + }else { + if(departmentEMap.get(entity.getDepartmentName()) == null){ + errList.add("第" + (i+2) + "行所属部门不存在。"); + } + } + // 岗位 + if(StringUtils.isEmpty(entity.getPostName())){ + errList.add("第" + (i+2) + "行所属岗位不能为空。"); + }else{ + DepartmentE departmentE = departmentEMap.get(entity.getDepartmentName()); + if(departmentE != null){ + List postListByDepartId = postList.stream().filter(post -> post.getDepartmentId().equals(departmentE.getId())).collect(Collectors.toList()); + if(CollUtil.isEmpty(postListByDepartId)){ + errList.add("第" + (i+2) + "行所属部门下不存在岗位信息。"); + }else { + Map postEMap = postListByDepartId.stream().collect(Collectors.toMap(PostE::getPostName, PostE -> PostE)); + if(postEMap.get(entity.getPostName()) == null){ + errList.add("第" + (i+2) + "行所属岗位信息与所属部门信息不匹配。"); + } + } + } + } + // 用户名 + if(StringUtils.isEmpty(entity.getUsername())){ + errList.add("第" + (i+2) + "行用户名不能为空。"); + }else { + if(CollUtil.isNotEmpty(userEMap)){ + if(userEMap.get(entity.getUsername()) != null){ + errList.add("第" + (i+2) + "行用户名重复。"); + } + } + if(usernameMap.get(entity.getUsername()) != null){ + errList.add("第" + (i+2) + "行用户名重复。"); + }else { + usernameMap.put(entity.getUsername(), entity.getUsername()); + } + } + if(StringUtils.isEmpty(entity.getName())){ + errList.add("第" + (i+2) + "行姓名不能为空。"); + } + if(StringUtils.isEmpty(entity.getPersonnelTypeName())){ + errList.add("第" + (i+2) + "行人员类型不能为空。"); + }else { + if(StringUtils.isEmpty(dictMap.get(entity.getPersonnelTypeName()))){ + errList.add("第" + (i+2) + "行人员类型与系统不匹配。"); + } + } } - return list; + + if(CollUtil.isNotEmpty(errList)){ + throw new BizException("导入信息有误，请检查后重新导入。", String.join("", errList)); + } + + // 映射 + List userEList = new ArrayList<>(); + for (int i = 0; i < list.size(); i++){ + UserExcelImportEntity entity = list.get(i); + UserE userE = new UserE(); + + // 部门 + Long departmentId = departmentEMap.get(entity.getDepartmentName()).getId(); + userE.setDepartmentId(departmentId); + userE.setDepartmentName(entity.getDepartmentName()); + + // 岗位 + List postListByDepartId = postList.stream().filter(post -> post.getDepartmentId().equals(departmentId)).collect(Collectors.toList()); + Map postEMap = postListByDepartId.stream().collect(Collectors.toMap(PostE::getPostName, PostE -> PostE)); + userE.setPostId(postEMap.get(entity.getPostName()).getId()); + userE.setPostName(entity.getPostName()); + + // 用户名 + userE.setUsername(entity.getUsername()); + // 姓名 + userE.setName(entity.getName()); + + // 人员类型 + userE.setPersonnelType(dictMap.get(entity.getPersonnelTypeName())); + userE.setPersonnelTypeName(entity.getPersonnelTypeName()); + + userEList.add(userE); + } + + return userEList; } } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/PostGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/PostGatewayImpl.java index 61838c5..ac8da86 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/PostGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/PostGatewayImpl.java @@ -2,6 +2,7 @@ package com.zcloud.basic.info.gatewayimpl; import com.alibaba.cola.exception.BizException; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jjb.saas.secure.context.AuthContext; import com.zcloud.basic.info.domain.gateway.PostGateway; import com.zcloud.basic.info.domain.model.PostE; import com.zcloud.basic.info.persistence.dataobject.PostDO; @@ -43,6 +44,12 @@ public class PostGatewayImpl implements PostGateway { if(StringUtils.isEmpty(d.getPostId())){ d.setPostId(UuidUtil.get32UUID()); } + if(d.getCorpinfoId() == null){ + d.setCorpinfoId(AuthContext.getTenantId()); + } + if(StringUtils.isEmpty(d.getCorpinfoName())){ + d.setCorpinfoName(AuthContext.getName()); + } // if(d.getSupervisionFlag() == null){ // d.setSupervisionFlag(0); // } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/DepartmentRepository.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/DepartmentRepository.java index 63b801c..f55fcf3 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/DepartmentRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/DepartmentRepository.java @@ -25,5 +25,7 @@ public interface DepartmentRepository extends BaseRepository { Long getCountByCorpInfoId(Long id); + List listByCorpInfoId(Long corpInfoId); + } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/PostRepository.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/PostRepository.java index 14de37a..03d05b6 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/PostRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/PostRepository.java @@ -6,6 +6,7 @@ import com.alibaba.cola.dto.SingleResponse; import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.repository.repo.BaseRepository; +import java.util.List; import java.util.Map; /** @@ -23,5 +24,7 @@ public interface PostRepository extends BaseRepository { SingleResponse getInfoById(Long id); Long getCountByCorpInfoId(Long id); + + List listByCorpInfoId(Long corpInfoId); } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java index 837b864..abcae0c 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java @@ -30,5 +30,7 @@ public interface UserRepository extends BaseRepository { List listByPostId(Long postId); List listByPostIds(Long[] postIds); + List listByCorpInfoId(Long corpInfoId); + } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java index 504c878..54c74b6 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java @@ -78,5 +78,13 @@ public class DepartmentRepositoryImpl extends BaseRepositoryImpl listByCorpInfoId(Long corpInfoId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("corpinfo_id", corpInfoId); + queryWrapper.eq("delete_enum", "FALSE"); + return list(queryWrapper); + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/PostRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/PostRepositoryImpl.java index d0e1f90..cc2b198 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/PostRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/PostRepositoryImpl.java @@ -16,6 +16,7 @@ import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -71,5 +72,13 @@ public class PostRepositoryImpl extends BaseRepositoryImpl i queryWrapper.eq("corpinfo_id", id); return postMapper.selectCount(queryWrapper); } + + @Override + public List listByCorpInfoId(Long corpInfoId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("corpinfo_id", corpInfoId); + queryWrapper.eq("delete_enum", "FALSE"); + return list(queryWrapper); + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserQualificationInfoRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserQualificationInfoRepositoryImpl.java index a5664b8..31e1512 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserQualificationInfoRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserQualificationInfoRepositoryImpl.java @@ -4,6 +4,7 @@ import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.SingleResponse; import com.alibaba.cola.exception.BizException; import com.jjb.saas.framework.repository.common.PageHelper; +import com.jjb.saas.secure.context.AuthContext; import com.zcloud.basic.info.persistence.dataobject.UserQualificationInfoDO; import com.zcloud.basic.info.persistence.mapper.UserQualificationInfoMapper; import com.zcloud.basic.info.persistence.repository.UserQualificationInfoRepository; @@ -33,6 +34,9 @@ public class UserQualificationInfoRepositoryImpl extends BaseRepositoryImpl listPage(Map params) { + if(params.get("eqCorpinfoId") == null){ + params.put("eqCorpinfoId", AuthContext.getTenantId()); + } IPage iPage = new Query().getPage(params); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params, "a."); @@ -44,6 +48,9 @@ public class UserQualificationInfoRepositoryImpl extends BaseRepositoryImpl list(Map params) { + if(params.get("eqCorpinfoId") == null){ + params.put("eqCorpinfoId", AuthContext.getTenantId()); + } QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); queryWrapper.orderByDesc("create_time"); diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java index d920bd1..76b242c 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java @@ -109,5 +109,13 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i List userPostList = this.list(queryWrapper); return userPostList; } + + @Override + public List listByCorpInfoId(Long corpInfoId) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("corpinfo_id", corpInfoId); + queryWrapper.eq("delete_enum", "FALSE"); + return list(queryWrapper); + } }