From 9d4aa553bed451177a9d7d8de5d60adf472d0359 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 6 Apr 2023 16:01:47 +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-staffOrgPaths?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dao/IcResiUserDao.java          | 2 +-
 .../java/com/epmet/service/impl/IcResiUserServiceImpl.java  | 6 ++++--
 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 7ea3b00fbb..0a7f17ebff 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
@@ -117,7 +117,7 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
                                            @Param("conditions") List<ResiUserQueryValueDTO> conditions,
                                            @Param("subTables") List<String> subTables,
                                            @Param("showSqlColumns") List<IcCustomExportResultDTO.SqlColumn> showSqlColumns, @Param("currentStaffAgencyId") String currentStaffAgencyId,
-                                           @Param("staffOrgPath") String staffOrgPath,
+                                           @Param("staffOrgPaths") List<String> staffOrgPaths,
                                            @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 d8e5ea3c17..960a55fcbb 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
@@ -1196,7 +1196,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                                                   String staffOrgPath) {
         // 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, staffOrgPath, map.get("groupByTables"));
+        return baseDao.dynamicQuery(customerId, resultTableName, conditions, map.get("finalSubTables"), null,
+                currentStaffAgencyId, Arrays.asList(staffOrgPath), map.get("groupByTables"));
     }
 
     @NotNull
@@ -2241,7 +2242,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         // List<String> finalSubTables = getFinalSubables(customerId, formCode, resultTableName, conditions);
         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, staffOrgPath, map.get("groupByTables"));
+        return baseDao.dynamicQuery(customerId, resultTableName, conditions, map.get("finalSubTables"), showSqlColumns,
+                currentStaffAgencyId, Arrays.asList(staffOrgPath), map.get("groupByTables"));
     }
 
     @Override