From 27e2ad1f33e163b20c37a24b7b08dfec89dd7b98 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 31 May 2022 14:13:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E5=8A=9E=E5=8D=95=E4=BD=8D=E5=BE=AE?=
 =?UTF-8?q?=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dao/IcPartyUnitDao.java       | 2 +-
 .../com/epmet/service/impl/IcPartyUnitServiceImpl.java    | 8 +++++++-
 .../src/main/resources/mapper/IcPartyUnitDao.xml          | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java
index a144e3f69d..2a5384d86e 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java
@@ -91,5 +91,5 @@ public interface IcPartyUnitDao extends BaseDao<IcPartyUnitEntity> {
      * @author zxc
      * @date 2022/5/18 13:48
      */
-    List<PartyUnitListResultDTO> getAssistanceUnitList(@Param("agencyId")String agencyId);
+    List<PartyUnitListResultDTO> getAssistanceUnitList(@Param("agencyId")String agencyId,@Param("pid")String pid);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
index c878b8f14d..2266178567 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
@@ -39,7 +39,9 @@ import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.ExcelPoiUtils;
@@ -626,7 +628,11 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
         if (null == staffInfo){
             throw new EpmetException("未查询到此工作人员信息"+tokenDto.getUserId());
         }
-        return baseDao.getAssistanceUnitList(staffInfo.getAgencyId());
+        AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(staffInfo.getAgencyId());
+        if (null == agencyInfo){
+            throw new EpmetException("未查询到此组织信息"+staffInfo.getAgencyId());
+        }
+        return baseDao.getAssistanceUnitList(staffInfo.getAgencyId(),agencyInfo.getPid());
     }
 
     private String getServiceMatter(Map<String, String> map, String matter) {
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml
index c3e86c3964..534f3dc1ad 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml
@@ -112,7 +112,7 @@
                     CREATED_TIME
                 FROM ic_party_unit
                 WHERE DEL_FLAG = '0'
-                    AND CONCAT(PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%')
+                  AND AGENCY_ID IN (#{pid},#{agencyId})
                 UNION ALL
                 SELECT
                     ID AS assistanceUnitId,