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 0a7f17ebff..9930c7338f 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 @@ -116,8 +116,10 @@ public interface IcResiUserDao extends BaseDao { @Param("resultTableName") String resultTableName, @Param("conditions") List conditions, @Param("subTables") List subTables, - @Param("showSqlColumns") List showSqlColumns, @Param("currentStaffAgencyId") String currentStaffAgencyId, + @Param("showSqlColumns") List showSqlColumns, + @Param("currentStaffAgencyId") String currentStaffAgencyId, @Param("staffOrgPaths") List staffOrgPaths, + @Param("gridIds") List gridIds, @Param("groupByTables") List groupByTables); /** 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 960a55fcbb..c4148c3d6b 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 @@ -1197,7 +1197,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl finalSubTables = getFinalSubables(customerId, formCode, resultTableName, conditions); Map> map = getFinalSubables(customerId, formCode, resultTableName, conditions, null); return baseDao.dynamicQuery(customerId, resultTableName, conditions, map.get("finalSubTables"), null, - currentStaffAgencyId, Arrays.asList(staffOrgPath), map.get("groupByTables")); + currentStaffAgencyId, Arrays.asList(staffOrgPath), null,map.get("groupByTables")); } @NotNull @@ -2243,7 +2243,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl exportNeedTableList = showSqlColumns.stream().map(IcCustomExportResultDTO.SqlColumn::getTableName).collect(Collectors.toList()); Map> map = getFinalSubables(customerId, formCode, resultTableName, conditions, exportNeedTableList); return baseDao.dynamicQuery(customerId, resultTableName, conditions, map.get("finalSubTables"), showSqlColumns, - currentStaffAgencyId, Arrays.asList(staffOrgPath), map.get("groupByTables")); + currentStaffAgencyId, Arrays.asList(staffOrgPath), null, map.get("groupByTables")); } @Override