diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/UserBaseInfoDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/UserBaseInfoDao.java index cea40d3a53..805657fc11 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/UserBaseInfoDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/UserBaseInfoDao.java @@ -43,11 +43,11 @@ public interface UserBaseInfoDao extends BaseDao { List selectUserInfosByUserIds(@Param("userIds") List userIds); /** - * @Description 查询客户下是党员/热心居民的userId - * @Param customerId + * @Description 查询是党员/热心居民的userId + * @Param userIds * @author zxc * @date 2021/4/1 上午9:08 */ - List selectUserIdByCustomerId(@Param("customerId") String customerId); + List selectUserIdByCustomerId(@Param("userIds") List userIds); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java index 0ccffa3d04..d6e03f7f40 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java @@ -19,11 +19,11 @@ public interface EpmetUserService { List selectUserInfosByUserIds(List userIds); /** - * @Description 查询客户下是党员/热心居民的userId - * @Param customerId + * @Description 查询是党员/热心居民的userId + * @Param userIds * @author zxc * @date 2021/4/1 上午9:08 */ - List selectUserIdByCustomerId(String customerId); + List selectUserIdByCustomerId(List userIds); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index 6d8e9ebe55..2dac9b0ccd 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -35,13 +35,13 @@ public class EpmetUserServiceImpl implements EpmetUserService { } /** - * @Description 查询客户下是党员/热心居民的userId - * @Param customerId + * @Description 查询是党员/热心居民的userId + * @Param userIds * @author zxc * @date 2021/4/1 上午9:08 */ @Override - public List selectUserIdByCustomerId(String customerId) { - return userBaseInfoDao.selectUserIdByCustomerId(customerId); + public List selectUserIdByCustomerId(List userIds) { + return userBaseInfoDao.selectUserIdByCustomerId(userIds); } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java index 5fa82d981c..5e5c727555 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java @@ -76,7 +76,7 @@ public class ResiGroupServiceImpl implements ResiGroupService { List badgeInfo = resiGroupRedis.getBadgeInfoByUserId(formDTO.getCustomerId(), r.getUserId()); r.setBadgeList(null==badgeInfo ? new ArrayList<>() : badgeInfo); }); - List showUsers = epmetUserService.selectUserIdByCustomerId(formDTO.getCustomerId()); + List showUsers = epmetUserService.selectUserIdByCustomerId(userIds); if (CollectionUtils.isEmpty(showUsers)){ return new ArrayList<>(); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml index 4c75e51e50..489908227d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml @@ -31,6 +31,10 @@ LEFT JOIN user_role ur ON ur.ROLE_ID = er.ID WHERE ur.DEL_FLAG = 0 AND (er.ROLE_KEY = 'warmhearted' OR er.ROLE_KEY = 'partymember') - AND CUSTOMER_ID = #{customerId} + AND ( + + ur.USER_ID = #{userId} + + ) \ No newline at end of file