fix：居民信息导出-gridIds

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

@@ -116,8 +116,10 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
                                            @Param("resultTableName") String resultTableName,
                                            @Param("conditions") List<ResiUserQueryValueDTO> conditions,
                                            @Param("subTables") List<String> subTables,
-                                           @Param("showSqlColumns") List<IcCustomExportResultDTO.SqlColumn> showSqlColumns, @Param("currentStaffAgencyId") String currentStaffAgencyId,
+                                           @Param("showSqlColumns") List<IcCustomExportResultDTO.SqlColumn> showSqlColumns,
+                                           @Param("currentStaffAgencyId") String currentStaffAgencyId,
                                            @Param("staffOrgPaths") List<String> staffOrgPaths,
+                                           @Param("gridIds") List<String> gridIds,
                                            @Param("groupByTables") List<String> groupByTables);
 
     /**

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

@@ -1197,7 +1197,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         // List<String> finalSubTables = getFinalSubables(customerId, formCode, resultTableName, conditions);
         Map<String, List<String>> 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<IcResiUserDao, IcResi
         List<String> exportNeedTableList = showSqlColumns.stream().map(IcCustomExportResultDTO.SqlColumn::getTableName).collect(Collectors.toList());
         Map<String, List<String>> 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