From 6e8e60f972ae9c98ad766642bf47517f905f9903 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Tue, 30 Dec 2025 17:04:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E5=8F=8A=E5=AF=86=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../info/command/query/UserQueryExe.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) 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 cee95698..393a36b2 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 @@ -14,30 +14,26 @@ import com.zcloud.basic.info.command.convertor.CorpInfoCoConvertor; import com.zcloud.basic.info.command.convertor.UserCoConvertor; import com.zcloud.basic.info.constant.RedisConstant; import com.zcloud.basic.info.domain.enums.UserEmploymentFlagEnum; -import com.zcloud.basic.info.domain.enums.UserFlowFlagEnum; import com.zcloud.basic.info.domain.gateway.UserGateway; import com.zcloud.basic.info.domain.model.UserE; 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; import com.zcloud.basic.info.persistence.repository.UserRepository; import com.zcloud.gbscommon.excelEntity.UserExcelExportEntity; -import com.zcloud.gbscommon.utils.DesensitizationUtils; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.gbscommon.utils.Tools; import com.zcloud.gbscommon.utils.ZcloudRedisUtil; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; -import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Component; import javax.servlet.http.HttpServletResponse; import java.util.*; +import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; @@ -219,17 +215,23 @@ public class UserQueryExe { if(CollUtil.isEmpty(userDOList)){ throw new BizException("用户不存在"); } + //获取在职的用户取第一个 + UserDO userDO = userDOList.stream().filter(userDO1 -> UserEmploymentFlagEnum.ON.getCode().equals(userDO1.getEmploymentFlag())).findFirst().orElse(null); + if(userDO == null){ + userDO = userDOList.get(0); + } + //判断密码是否正确 UserE userE = new UserE(); - userE.setPassword(userDOList.get(0).getPassword()); - Boolean checkUserPassword = userE.checkUserPassword(cmd.getPassword(), userDOList.get(0).getPassword()); + userE.setPassword(userDO.getPassword()); + Boolean checkUserPassword = userE.checkUserPassword(cmd.getPassword(), userDO.getPassword()); if(!checkUserPassword){ throw new BizException("密码错误"); } //判断用户信息是否完善 UserE userCheck = new UserE(); - BeanUtils.copyProperties(userDOList.get(0), userCheck); + BeanUtils.copyProperties(userDO, userCheck); Boolean b = userCheck.checkUserInfoComplete(userCheck); userLoginCO.setIsInfoComplete(b); @@ -238,7 +240,6 @@ public class UserQueryExe { List corpInfoCOS = corpInfoCoConvertor.converUserInfoDOsToCOs(userCorpDOS); userLoginCO.setUserCorpInfoCOList(corpInfoCOS); - UserDO userDO = userRepository.getInfoById(userDOList.get(0).getId()); userLoginCO.setUserCO(userCoConvertor.converDOToCO(userDO)); return userLoginCO; }