Merge remote-tracking branch 'origin/dev_ic_platform' into develop

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java

@@ -142,6 +142,6 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
      * @date 2021/11/8 1:50 下午
      */
     Map<String,String> selectPersonType(@Param("columns")List<String> columns,@Param("customerId")String customerId,
-                                        @Param("tableName")String tableName);
+                                        @Param("tableName")String tableName,@Param("userId")String userId);
 
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -552,7 +552,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 Map<String, List<IcResiCategoryStatsConfigDTO>> groupByTableName = showList.stream().collect(Collectors.groupingBy(IcResiCategoryStatsConfigDTO::getTableName));
                 groupByTableName.forEach((tableName,list) -> {
                     List<String> columns = list.stream().map(IcResiCategoryStatsConfigDTO::getColumnName).collect(Collectors.toList());
-                    Map<String, String> result = baseDao.selectPersonType(columns, personData.getCustomerId(), tableName);
+                    Map<String, String> result = baseDao.selectPersonType(columns, personData.getCustomerId(), tableName,formDTO.getUserId());
                     list.forEach(l -> {
                         result.forEach((k,v) -> {
                             if (l.getColumnName().equals(k) && v.equals(NumConstant.ONE_STR)){

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -258,11 +258,17 @@
     <!-- 查询人员类别 -->
     <select id="selectPersonType" resultType="java.util.Map">
         select
-        <foreach collection="columns" separator="," index="c">
+        <foreach collection="columns" separator="," item="c">
-            IFNULL(${key},'0') AS #{key}
+            IFNULL(`${c}`,'0') AS `${c}`
         </foreach>
-        from #{tableName}
+        from ${tableName}
         where DEL_FLAG = '0'
         AND CUSTOMER_ID = #{customerId}
+        <if test=' tableName == "ic_resi_user" '>
+            AND ID = #{userId}
+        </if>
+        <if test=' tableName != "ic_resi_user" '>
+            AND IC_RESI_USER = #{userId}
+        </if>
     </select>
 </mapper>