diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index fbd753f8fb..abc46bfbf9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -142,6 +142,6 @@ public interface IcResiUserDao extends BaseDao { * @date 2021/11/8 1:50 下午 */ Map selectPersonType(@Param("columns")List columns,@Param("customerId")String customerId, - @Param("tableName")String tableName); + @Param("tableName")String tableName,@Param("userId")String userId); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 758c348ad6..febefe4b52 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -552,7 +552,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl> groupByTableName = showList.stream().collect(Collectors.groupingBy(IcResiCategoryStatsConfigDTO::getTableName)); groupByTableName.forEach((tableName,list) -> { List columns = list.stream().map(IcResiCategoryStatsConfigDTO::getColumnName).collect(Collectors.toList()); - Map result = baseDao.selectPersonType(columns, personData.getCustomerId(), tableName); + Map 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)){ diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index f05bbb4176..712e78ed81 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -258,11 +258,17 @@