From 2d45e621bad491eb748b134377c8fb5c901bfad7 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Mon, 29 Dec 2025 16:38:19 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E5=85=A5=E8=81=8C?= =?UTF-8?q?=E7=A6=BB=E8=81=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/info/app/AppUserController.java | 4 +- .../basic/info/command/UserUpdateExe.java | 41 +++++------- .../convertor/CorpInfoCoConvertor.java | 8 +-- .../info/command/query/UserQueryExe.java | 67 +++++++------------ .../basic/info/service/UserServiceImpl.java | 7 +- .../zcloud/basic/info/api/UserServiceI.java | 7 +- .../info/dto/clientobject/UserCorpInfoCO.java | 41 ++++++++++++ .../info/dto/clientobject/UserLoginCO.java | 2 +- .../dataobject/UserCorpInfoDO.java | 35 ++++++++++ .../persistence/mapper/UserCorpMapper.java | 5 ++ .../repository/UserCorpRepository.java | 3 + .../repository/UserRepository.java | 2 + .../impl/UserCorpRepositoryImpl.java | 6 +- .../repository/impl/UserRepositoryImpl.java | 7 ++ .../main/resources/mapper/UserCorpMapper.xml | 12 ++++ 15 files changed, 159 insertions(+), 88 deletions(-) create mode 100644 web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCorpInfoCO.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserCorpInfoDO.java diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/app/AppUserController.java b/web-adapter/src/main/java/com/zcloud/basic/info/app/AppUserController.java index c345b936..86755d9e 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/app/AppUserController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/app/AppUserController.java @@ -117,14 +117,12 @@ public class AppUserController { } @ApiOperation("app获取用户在职企业") @PostMapping("/getUserCorpList/{id}") - public MultiResponse getUserCorpList(@PathVariable("id") Long id) { + public MultiResponse getUserCorpList(@PathVariable("id") Long id) { return MultiResponse.of(userService.getUserCorpList(id)); } @ApiOperation("app获取图形验证码") @PostMapping("/generateCaptcha") public Response generateCaptcha() { - - CaptchaCO captchaCO = new CaptchaCO(); return SingleResponse.of(userService.generateCaptcha()); } } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java index f4bac2cb..f5d69470 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java @@ -187,6 +187,7 @@ public class UserUpdateExe { BeanUtils.copyProperties(cmd, userDO); return userRepository.updateFaceUrl(userDO); } + @Transactional(rollbackFor = Exception.class) public void executeResignation(UserResignationCmd userResignationCmd) { //获取用户信息,并更新离职状态为离职 @@ -266,10 +267,10 @@ public class UserUpdateExe { /* if (UserFlowFlagEnum.FLOW.getCode().equals(userDO.getFlowFlag())) { userE = userCorpRepository.executeReviewStatus(userDO.getId(), corpinfoId, employmentFlag); } else {*/ - userE = new UserE(); - BeanUtils.copyProperties(userDO, userE); - userE.setEmploymentFlag(employmentFlag); - userGateway.update(userE); + userE = new UserE(); + BeanUtils.copyProperties(userDO, userE); + userE.setEmploymentFlag(employmentFlag); + userGateway.update(userE); // } // if (userE == null) { // return; @@ -332,10 +333,10 @@ public class UserUpdateExe { /* if (UserFlowFlagEnum.FLOW.getCode().equals(userDO.getFlowFlag())) { userE = userCorpRepository.executeReviewStatus(userDO.getId(), corpinfoId, employmentFlag); } else {*/ - userE = new UserE(); - BeanUtils.copyProperties(userDO, userE); - userE.setEmploymentFlag(employmentFlag); - userGateway.update(userE); + userE = new UserE(); + BeanUtils.copyProperties(userDO, userE); + userE.setEmploymentFlag(employmentFlag); + userGateway.update(userE); // } if (userE == null) { return; @@ -402,22 +403,12 @@ public class UserUpdateExe { UserE userE = null; Long corpinfoId = appUserResignationCmd.getCorpinfoId() == null ? AuthContext.getTenantId() : appUserResignationCmd.getCorpinfoId(); Integer employmentFlagBefore = null; - if (UserFlowFlagEnum.FLOW.getCode().equals(userDO.getFlowFlag())) { - UserCorpDO userCorpDO = userCorpRepository.getInfoByUserId(userDO.getId(), corpinfoId); - if (userCorpDO == null) { - return; - } - employmentFlagBefore = userCorpDO.getEmploymentFlag(); - userE = userCorpRepository.executeResignation(userCorpDO, corpinfoId, UserEmploymentFlagEnum.RESIGNATION_AUDIT.getCode()); - userCorpDO.setEmploymentFlag(UserEmploymentFlagEnum.RESIGNATION_AUDIT.getCode()); - userCorpRepository.updateById(userCorpDO); - } else { - userE = new UserE(); - BeanUtils.copyProperties(userDO, userE); - employmentFlagBefore = userDO.getEmploymentFlag(); - userE.setEmploymentFlag(UserEmploymentFlagEnum.RESIGNATION_AUDIT.getCode()); - userGateway.update(userE); - } + userE = new UserE(); + BeanUtils.copyProperties(userDO, userE); + employmentFlagBefore = userDO.getEmploymentFlag(); + userE.setEmploymentFlag(UserEmploymentFlagEnum.RESIGNATION_AUDIT.getCode()); + userGateway.update(userE); + UserCorpRecordDO userCorpRecordDO = userCorpRecordRepository.getInfoByUserId(userDO.getId(), corpinfoId, UserEmploymentFlagEnum.ON.getCode()); userCorpRecordDO.setStatus(UserChangeRecordStatusEnum.PENDING.getCode()); userCorpRecordDO.setResignationReason(appUserResignationCmd.getResignationReason()); @@ -515,7 +506,7 @@ public class UserUpdateExe { // riskCmd.setCorpinfoId(info.getCorpinfoId()); // zcloudRiskFacade.updateListManagerStatusByUserId(riskCmd); // userJobHandoverRepository.processUserJobHandover(info.getUserChangeRecordId()); - //风险辨识检查出异常是直接抛异常 + //风险辨识检查出异常是直接抛异常 // break; } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/convertor/CorpInfoCoConvertor.java b/web-app/src/main/java/com/zcloud/basic/info/command/convertor/CorpInfoCoConvertor.java index 2d9e010c..c8870515 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/convertor/CorpInfoCoConvertor.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/convertor/CorpInfoCoConvertor.java @@ -2,13 +2,11 @@ package com.zcloud.basic.info.command.convertor; import com.zcloud.basic.info.domain.model.CorpDepartmentE; import com.zcloud.basic.info.domain.model.DepartmentE; -import com.zcloud.basic.info.dto.clientobject.CorpDepartmentCO; -import com.zcloud.basic.info.dto.clientobject.CorpInfoCO; -import com.zcloud.basic.info.dto.clientobject.CorpInfoXgfItemCO; -import com.zcloud.basic.info.dto.clientobject.CorpUserMiddleCO; +import com.zcloud.basic.info.dto.clientobject.*; import com.zcloud.basic.info.persistence.dataobject.CorpFormDO; import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO; import com.zcloud.basic.info.persistence.dataobject.DepartmentDO; +import com.zcloud.basic.info.persistence.dataobject.UserCorpInfoDO; import com.zcloud.gbscommon.zcloudcorp.response.ZcloudCorpInfoCO; import org.mapstruct.Mapper; @@ -40,5 +38,7 @@ public interface CorpInfoCoConvertor { List converDOsToMiddleCOs(List data); List converDOsToItemCOs(List corpFormDOS); + + List converUserInfoDOsToCOs(List userCorpDOS); } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java index f1b96a95..716465a7 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java @@ -21,6 +21,7 @@ import com.zcloud.basic.info.dto.*; import com.zcloud.basic.info.dto.clientobject.*; import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO; import com.zcloud.basic.info.persistence.dataobject.UserCorpDO; +import com.zcloud.basic.info.persistence.dataobject.UserCorpInfoDO; import com.zcloud.basic.info.persistence.dataobject.UserDO; import com.zcloud.basic.info.persistence.repository.CorpInfoRepository; import com.zcloud.basic.info.persistence.repository.UserCorpRepository; @@ -224,69 +225,47 @@ public class UserQueryExe { if(captcha == null || !captcha.toString().equals(cmd.getCaptchaCode())){ throw new BizException("验证码错误"); } - //返回企业列表 - UserDO userDO = userRepository.getByPhone(cmd.getPhone()); - if(userDO == null){ - throw new BizException("手机号不存在"); + //根据手机号获取用户列表 + List userDOList = userRepository.getListByPhone(cmd.getPhone()); + if(CollUtil.isEmpty(userDOList)){ + throw new BizException("用户不存在"); } + //判断密码是否正确 UserE userE = new UserE(); - userE.setPassword(userDO.getPassword()); - Boolean checkUserPassword = userE.checkUserPassword(cmd.getPassword(), userDO.getPassword()); + userE.setPassword(userDOList.get(0).getPassword()); + Boolean checkUserPassword = userE.checkUserPassword(cmd.getPassword(), userDOList.get(0).getPassword()); if(!checkUserPassword){ throw new BizException("密码错误"); } //判断用户信息是否完善 UserE userCheck = new UserE(); - BeanUtils.copyProperties(userDO, userCheck); + BeanUtils.copyProperties(userDOList.get(0), userCheck); Boolean b = userCheck.checkUserInfoComplete(userCheck); userLoginCO.setIsInfoComplete(b); - List corpInfoCOList = new ArrayList<>(); - //判断是流动人员还是固定人员 - if(UserFlowFlagEnum.FIXED.getCode().equals(userDO.getFlowFlag()) && userDO.getCorpinfoId() != null && UserEmploymentFlagEnum.ON.getCode().equals(userDO.getEmploymentFlag())){ - CorpInfoDO corpInfoDO = corpInfoRepository.getById(userDO.getCorpinfoId()); - CorpInfoCO corpInfoCO = new CorpInfoCO(); - BeanUtils.copyProperties(corpInfoDO, corpInfoCO); - corpInfoCOList.add(corpInfoCO); - } - if(UserFlowFlagEnum.FLOW.getCode().equals(userDO.getFlowFlag())){ - List userCorpDOS = userCorpRepository.getONCorpInfo(userDO.getId()); - if(CollUtil.isNotEmpty(userCorpDOS)){ - List corpinfoIds = userCorpDOS.stream().map(UserCorpDO::getCorpinfoId).collect(Collectors.toList()); - List corpInfoDOList = corpInfoRepository.getByIdList(corpinfoIds); - List corpInfoCOS = corpInfoCoConvertor.converDOsToCOs(corpInfoDOList); - corpInfoCOList.addAll(corpInfoCOS); - } + List userIds = userDOList.stream().map(UserDO::getId).collect(Collectors.toList()); + List userCorpDOS = userCorpRepository.getListByUserIds(userIds); + List corpInfoCOS = corpInfoCoConvertor.converUserInfoDOsToCOs(userCorpDOS); - } - userLoginCO.setCorpInfoCOList(corpInfoCOList); + userLoginCO.setUserCorpInfoCOList(corpInfoCOS); + UserDO userDO = userRepository.getInfoById(userDOList.get(0).getId()); userLoginCO.setUserCO(userCoConvertor.converDOToCO(userDO)); return userLoginCO; } - public List getUserCorpList(Long id) { + public List getUserCorpList(Long id) { //返回企业列表 UserDO userDO = userRepository.getById(id); - //判断是流动人员还是固定人员 - if(UserFlowFlagEnum.FIXED.getCode().equals(userDO.getFlowFlag()) && userDO.getCorpinfoId() != null){ - CorpInfoDO corpInfoDO = corpInfoRepository.getById(userDO.getCorpinfoId()); - CorpInfoCO corpInfoCO = new CorpInfoCO(); - BeanUtils.copyProperties(corpInfoDO, corpInfoCO); - return Arrays.asList(corpInfoCO); - } - if(UserFlowFlagEnum.FLOW.getCode().equals(userDO.getFlowFlag())){ - List userCorpDOS = userCorpRepository.getONCorpInfo(userDO.getId()); - if(CollUtil.isEmpty(userCorpDOS)){ - return null; - } - List corpinfoIds = userCorpDOS.stream().map(UserCorpDO::getCorpinfoId).collect(Collectors.toList()); - List corpInfoDOList = corpInfoRepository.getByIdList(corpinfoIds); - List corpInfoCOS = corpInfoCoConvertor.converDOsToCOs(corpInfoDOList); - return corpInfoCOS; - } - return null; + //根据手机号获取用户列表 + List userDOList = userRepository.getListByPhone(userDO.getPhone()); + + List userIds = userDOList.stream().map(UserDO::getId).collect(Collectors.toList()); + List userCorpDOS = userCorpRepository.getListByUserIds(userIds); + List corpInfoCOS = corpInfoCoConvertor.converUserInfoDOsToCOs(userCorpDOS); + return corpInfoCOS; + } public CaptchaCO generateCaptcha() { diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java index 0eaea874..7b8dccb1 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java @@ -11,10 +11,7 @@ import com.zcloud.basic.info.command.UserRemoveExe; import com.zcloud.basic.info.command.UserUpdateExe; import com.zcloud.basic.info.command.query.UserQueryExe; import com.zcloud.basic.info.dto.*; -import com.zcloud.basic.info.dto.clientobject.CorpInfoCO; -import com.zcloud.basic.info.dto.clientobject.UserCO; -import com.zcloud.basic.info.dto.clientobject.UserLoginCO; -import com.zcloud.basic.info.dto.clientobject.UserXmfCO; +import com.zcloud.basic.info.dto.clientobject.*; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -217,7 +214,7 @@ public class UserServiceImpl implements UserServiceI { } @Override - public List getUserCorpList(Long id) { + public List getUserCorpList(Long id) { return userQueryExe.getUserCorpList(id); } diff --git a/web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java b/web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java index e528b12c..3332d85b 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java +++ b/web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java @@ -6,10 +6,7 @@ import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; import com.zcloud.basic.info.dto.*; -import com.zcloud.basic.info.dto.clientobject.CorpInfoCO; -import com.zcloud.basic.info.dto.clientobject.UserCO; -import com.zcloud.basic.info.dto.clientobject.UserLoginCO; -import com.zcloud.basic.info.dto.clientobject.UserXmfCO; +import com.zcloud.basic.info.dto.clientobject.*; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; @@ -86,7 +83,7 @@ public interface UserServiceI { UserLoginCO login(UserAppLoginCmd cmd); - List getUserCorpList(Long id); + List getUserCorpList(Long id); CaptchaCO generateCaptcha(); } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCorpInfoCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCorpInfoCO.java new file mode 100644 index 00000000..80f13daf --- /dev/null +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCorpInfoCO.java @@ -0,0 +1,41 @@ +package com.zcloud.basic.info.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-10-30 15:12:49 + */ +@Data +public class UserCorpInfoCO implements Serializable { + + //用户id + @ApiModelProperty(value = "用户id") + private Long userId; + //主键 + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + + //企业名称 + @ApiModelProperty(value = "企业名称") + private String corpName; + + //企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位) + @ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)") + private Integer type; + + +} + diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserLoginCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserLoginCO.java index 0e03c44b..def47a2a 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserLoginCO.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserLoginCO.java @@ -22,7 +22,7 @@ public class UserLoginCO extends ClientObject { private Boolean isInfoComplete; @ApiModelProperty(value = "用户关联的公司列表") - private List corpInfoCOList; + private List userCorpInfoCOList; private UserCO userCO; } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserCorpInfoDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserCorpInfoDO.java new file mode 100644 index 00000000..d0913ab8 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserCorpInfoDO.java @@ -0,0 +1,35 @@ +package com.zcloud.basic.info.persistence.dataobject; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-10-30 15:12:49 + */ +@Data +public class UserCorpInfoDO implements Serializable { + + //用户id + @ApiModelProperty(value = "用户id") + private Long userId; + //主键 + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + + //企业名称 + @ApiModelProperty(value = "企业名称") + private String corpinfoName; + + //企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位) + @ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)") + private Integer type; + + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserCorpMapper.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserCorpMapper.java index 95f836cd..721803e5 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserCorpMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserCorpMapper.java @@ -2,8 +2,11 @@ package com.zcloud.basic.info.persistence.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zcloud.basic.info.persistence.dataobject.UserCorpDO; +import com.zcloud.basic.info.persistence.dataobject.UserCorpInfoDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * web-infrastructure * @@ -14,5 +17,7 @@ import org.apache.ibatis.annotations.Mapper; public interface UserCorpMapper extends BaseMapper { UserCorpDO getInfoByUserId(Long userId, Long corpinfoId); + + List getListByUserIds(List userIds); } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserCorpRepository.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserCorpRepository.java index b13c287c..00a1afb3 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserCorpRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserCorpRepository.java @@ -4,6 +4,7 @@ import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.repository.repo.BaseRepository; import com.zcloud.basic.info.domain.model.UserE; import com.zcloud.basic.info.persistence.dataobject.UserCorpDO; +import com.zcloud.basic.info.persistence.dataobject.UserCorpInfoDO; import javax.validation.constraints.NotNull; import java.util.List; @@ -35,5 +36,7 @@ public interface UserCorpRepository extends BaseRepository { void removeByUserId(Long userId); List getONCorpInfo(@NotNull(message = "用户id不能为空") Long id); + + List getListByUserIds(List userIds); } 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 08ee7c32..54345cd2 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 @@ -82,5 +82,7 @@ public interface UserRepository extends BaseRepository { UserDO getByPhoneAndIdCard(String phone, String idCardNumber); void checkUserIdCard(@NotNull(message = "主键id不能为空") Long id, String userIdCard); + + List getListByPhone(String phone); } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserCorpRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserCorpRepositoryImpl.java index 32740ec7..6cdf4c68 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserCorpRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserCorpRepositoryImpl.java @@ -8,6 +8,7 @@ import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import com.zcloud.basic.info.domain.enums.UserEmploymentFlagEnum; import com.zcloud.basic.info.domain.model.UserE; import com.zcloud.basic.info.persistence.dataobject.UserCorpDO; +import com.zcloud.basic.info.persistence.dataobject.UserCorpInfoDO; import com.zcloud.basic.info.persistence.dataobject.UserCorpRecordDO; import com.zcloud.basic.info.persistence.mapper.UserCorpMapper; import com.zcloud.basic.info.persistence.repository.UserCorpRepository; @@ -117,6 +118,9 @@ public class UserCorpRepositoryImpl extends BaseRepositoryImpl getListByUserIds(List userIds) { + return userCorpMapper.getListByUserIds(userIds); + } } 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 9210f747..ee99dd55 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 @@ -534,5 +534,12 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i throw new BizException("身份证号已经存在，请联系管理员"); } } + + @Override + public List getListByPhone(String phone) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("phone", phone); + return list(queryWrapper); + } } diff --git a/web-infrastructure/src/main/resources/mapper/UserCorpMapper.xml b/web-infrastructure/src/main/resources/mapper/UserCorpMapper.xml index 9cd01ad0..ce495a80 100644 --- a/web-infrastructure/src/main/resources/mapper/UserCorpMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/UserCorpMapper.xml @@ -13,5 +13,17 @@ and uc.corpinfo_id = #{corpinfoId} and uc.delete_enum = 'FALSE' + +