From 4f70907f034428fecf789e127a1aceca149c46d0 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 7 Jan 2022 10:54:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E4=BA=A7=E5=93=81=E8=A6=81=E6=B1=82?=
 =?UTF-8?q?=20=E9=9C=80=E6=B1=82=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/form/GetListSocietyOrgFormDTO.java    | 2 ++
 .../java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java | 4 +++-
 .../src/main/resources/mapper/IcSocietyOrgDao.xml            | 5 ++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/GetListSocietyOrgFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/GetListSocietyOrgFormDTO.java
index c04a76dc77..9f0357a1d7 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/GetListSocietyOrgFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/GetListSocietyOrgFormDTO.java
@@ -54,5 +54,7 @@ public class GetListSocietyOrgFormDTO implements Serializable {
     private String staffId;
     //token中userId所属组织的pid
     private String pids;
+    //token中userId所属组织Id
+    private String agencyId;
 
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java
index 52193bb4df..8c4768b2bc 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java
@@ -117,7 +117,9 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl<IcSocietyOrgDao, Ic
     public GetListSocietyOrgResultDTO getList(GetListSocietyOrgFormDTO formDTO) {
         GetListSocietyOrgResultDTO resultDTO = new GetListSocietyOrgResultDTO();
         CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
-        formDTO.setPids(staffInfoCache.getAgencyPIds());
+        //2022.1.7 应产品要求 当前组织只能看到自己组织添加的社会组织数据，不允许看其他下级的
+        //formDTO.setPids(staffInfoCache.getAgencyPIds());
+        formDTO.setAgencyId(staffInfoCache.getAgencyId());
         //1.根据查询条件分页查询社会组织数据
         PageInfo<SocietyOrgListResultDTO> result =
                 PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> baseDao.getList(formDTO));
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcSocietyOrgDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcSocietyOrgDao.xml
index 56daf5dc2b..74031c3426 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcSocietyOrgDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcSocietyOrgDao.xml
@@ -24,8 +24,11 @@
         <if test="customerId != null and customerId.trim() != ''">
             AND customer_id = #{customerId}
         </if>
-        <if test="pids != null and pids.trim() != ''">
+       <!-- <if test="pids != null and pids.trim() != ''">
             AND pids LIKE CONCAT('%', #{pids}, '%')
+        </if>-->
+        <if test="agencyId != null and agencyId.trim() != ''">
+            AND agency_id = #{agencyId}
         </if>
         <if test="societyName != null and societyName.trim() != ''">
             AND society_name LIKE CONCAT('%', #{societyName}, '%')