From 9c3fd671d028280255fd96e66b90dac19c547a93 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Mon, 29 Dec 2025 17:11:44 +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/command/query/UserQueryExe.java | 16 ++-------------- .../info/persistence/mapper/UserCorpMapper.java | 1 - .../info/persistence/mapper/UserMapper.java | 3 +++ .../repository/UserCorpRepository.java | 1 - .../persistence/repository/UserRepository.java | 3 +++ .../repository/impl/UserCorpRepositoryImpl.java | 5 +---- .../repository/impl/UserRepositoryImpl.java | 6 ++++++ .../src/main/resources/mapper/UserCorpMapper.xml | 12 +----------- .../src/main/resources/mapper/UserMapper.xml | 12 +++++++++++- 9 files changed, 27 insertions(+), 32 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 716465a7..0c4f1d52 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 @@ -102,18 +102,6 @@ public class UserQueryExe { UserDO userDO = userRepository.getInfoById(id); UserCO userCO = new UserCO(); BeanUtils.copyProperties(userDO, userCO); - //如果是相关方流动人员，查找岗位部门 - UserCorpDO userCorpDO = userCorpRepository.getInfoByUserId(userCO.getId(),AuthContext.getTenantId()); - if(userCorpDO != null){ - userCO.setDepartmentId(userCorpDO.getDepartmentId()); - userCO.setPostId(userCorpDO.getPostId()); - userCO.setPostName(userCorpDO.getPostName()); - userCO.setRoleId(userCorpDO.getRoleId()); - userCO.setSort(userCorpDO.getSort()); - userCO.setCorpinfoId(userCorpDO.getCorpinfoId()); - userCO.setEmploymentFlag(userCorpDO.getEmploymentFlag()); - } - return SingleResponse.of(userCO); } @@ -246,7 +234,7 @@ public class UserQueryExe { userLoginCO.setIsInfoComplete(b); List userIds = userDOList.stream().map(UserDO::getId).collect(Collectors.toList()); - List userCorpDOS = userCorpRepository.getListByUserIds(userIds); + List userCorpDOS = userRepository.getListByUserIds(userIds); List corpInfoCOS = corpInfoCoConvertor.converUserInfoDOsToCOs(userCorpDOS); userLoginCO.setUserCorpInfoCOList(corpInfoCOS); @@ -262,7 +250,7 @@ public class UserQueryExe { List userDOList = userRepository.getListByPhone(userDO.getPhone()); List userIds = userDOList.stream().map(UserDO::getId).collect(Collectors.toList()); - List userCorpDOS = userCorpRepository.getListByUserIds(userIds); + List userCorpDOS = userRepository.getListByUserIds(userIds); List corpInfoCOS = corpInfoCoConvertor.converUserInfoDOsToCOs(userCorpDOS); return corpInfoCOS; 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 721803e5..a57f8294 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 @@ -18,6 +18,5 @@ 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/mapper/UserMapper.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserMapper.java index 8abf61bd..121ac73a 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserMapper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.datascope.annotation.DataScope; import com.jjb.saas.framework.datascope.annotation.DataScopes; import com.zcloud.basic.info.persistence.dataobject.DepartmentLeaderStatictiscDO; +import com.zcloud.basic.info.persistence.dataobject.UserCorpInfoDO; import com.zcloud.basic.info.persistence.dataobject.UserDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -36,5 +37,7 @@ public interface UserMapper extends BaseMapper { Integer countUser(@Param("params") Map params); IPage listXgf(IPage iPage, Map params, String menuPerms); + + 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 00a1afb3..f20cf91a 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 @@ -37,6 +37,5 @@ public interface UserCorpRepository extends BaseRepository { 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 2b370732..4d57bf70 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 @@ -8,6 +8,7 @@ import com.jjb.saas.framework.repository.repo.BaseRepository; import com.jjb.saas.system.client.role.response.RoleCO; import com.zcloud.basic.info.domain.model.CorpInfoE; import com.zcloud.basic.info.domain.model.UserE; +import com.zcloud.basic.info.persistence.dataobject.UserCorpInfoDO; import com.zcloud.basic.info.persistence.dataobject.UserDO; import org.apache.catalina.User; @@ -81,5 +82,7 @@ public interface UserRepository extends BaseRepository { void checkUserIdCard(@NotNull(message = "主键id不能为空") Long id, String userIdCard); List getListByPhone(String phone); + + List getListByUserIds(List userIds); } 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 6cdf4c68..2f67b451 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 @@ -118,9 +118,6 @@ 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 6ef0bf1e..3dfc124f 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 @@ -29,6 +29,7 @@ import com.zcloud.basic.info.domain.enums.MenuEnum; import com.zcloud.basic.info.domain.enums.UserEmploymentFlagEnum; import com.zcloud.basic.info.domain.model.UserE; import com.zcloud.basic.info.persistence.dataobject.DepartmentLeaderStatictiscDO; +import com.zcloud.basic.info.persistence.dataobject.UserCorpInfoDO; import com.zcloud.basic.info.persistence.dataobject.UserDO; import com.zcloud.basic.info.persistence.mapper.UserMapper; import com.zcloud.basic.info.persistence.repository.UserRepository; @@ -534,5 +535,10 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i queryWrapper.eq("phone", phone); return list(queryWrapper); } + + @Override + public List getListByUserIds(List userIds) { + return userMapper.getListByUserIds(userIds); + } } diff --git a/web-infrastructure/src/main/resources/mapper/UserCorpMapper.xml b/web-infrastructure/src/main/resources/mapper/UserCorpMapper.xml index 18db6d6d..1b10a843 100644 --- a/web-infrastructure/src/main/resources/mapper/UserCorpMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/UserCorpMapper.xml @@ -14,16 +14,6 @@ and uc.delete_enum = 'FALSE' - + diff --git a/web-infrastructure/src/main/resources/mapper/UserMapper.xml b/web-infrastructure/src/main/resources/mapper/UserMapper.xml index d9b75390..5d212535 100644 --- a/web-infrastructure/src/main/resources/mapper/UserMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/UserMapper.xml @@ -340,6 +340,16 @@ - +