Merge remote-tracking branch 'origin/dev_group0329' into dev_temp

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<UserBaseInfoEntity> {
     List<UserInfosResultDTO> selectUserInfosByUserIds(@Param("userIds") List<String> userIds);
 
     /**
-     * @Description  查询客户下是党员/热心居民的userId
-     * @Param customerId
+     * @Description  查询是党员/热心居民的userId
+     * @Param userIds
      * @author zxc
      * @date 2021/4/1 上午9:08
      */
-    List<String> selectUserIdByCustomerId(@Param("customerId") String customerId);
+    List<String> selectUserIdByCustomerId(@Param("userIds") List<String> userIds);
 
 }

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<UserInfosResultDTO> selectUserInfosByUserIds(List<String> userIds);
 
     /**
-     * @Description  查询客户下是党员/热心居民的userId
-     * @Param customerId
+     * @Description  查询是党员/热心居民的userId
+     * @Param userIds
      * @author zxc
      * @date 2021/4/1 上午9:08
      */
-    List<String> selectUserIdByCustomerId(String customerId);
+    List<String> selectUserIdByCustomerId(List<String> userIds);
 
 }

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<String> selectUserIdByCustomerId(String customerId) {
-        return userBaseInfoDao.selectUserIdByCustomerId(customerId);
+    public List<String> selectUserIdByCustomerId(List<String> userIds) {
+        return userBaseInfoDao.selectUserIdByCustomerId(userIds);
     }
 }

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<String> badgeInfo = resiGroupRedis.getBadgeInfoByUserId(formDTO.getCustomerId(), r.getUserId());
             r.setBadgeList(null==badgeInfo ? new ArrayList<>() : badgeInfo);
         });
-        List<String> showUsers = epmetUserService.selectUserIdByCustomerId(formDTO.getCustomerId());
+        List<String> showUsers = epmetUserService.selectUserIdByCustomerId(userIds);
         if (CollectionUtils.isEmpty(showUsers)){
             return new ArrayList<>();
         }

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 (
+              <foreach collection="userIds" item="userId" separator=" OR ">
+                  ur.USER_ID = #{userId}
+              </foreach>
+            )
     </select>
 </mapper>