From bc90dcd82d3ac5fb6191c0789306669aa2e53ede Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 6 Apr 2023 16:15:48 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=B1=85=E6=B0=91=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=AF=BC=E5=87=BA-gridIds?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dao/IcResiUserDao.java            | 4 +++-
 .../java/com/epmet/service/impl/IcResiUserServiceImpl.java    | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

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<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);
 
     /**
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<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