From 71bfa9058271a355ebc58416e425da58c5e99a56 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 26 Jan 2022 09:33:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E6=8C=87=E6=B4=BE=E7=A4=BE?=
 =?UTF-8?q?=E4=BC=9A=E7=BB=84=E7=BB=87=E4=B8=8B=E6=8B=89=E6=A1=86=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E4=B8=8E=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=80=E8=87=B4=EF=BC=9A=E5=B1=95=E7=A4=BA=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98=E6=89=80=E5=B1=9E?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=BB=BA=E7=AB=8B=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/IcSocietyOrgServiceImpl.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 e0470c14dd..6542740821 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
@@ -19,7 +19,6 @@ package com.epmet.service.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
@@ -176,14 +175,15 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl<IcSocietyOrgDao, Ic
             throw new RenException("工作人员所属组织信息查询异常");
         }
         List<String> agencyIds = new ArrayList<>();
-        if (StringUtils.isNotBlank(staffInfoCacheResult.getAgencyPIds()) && !NumConstant.ZERO_STR.equals(staffInfoCacheResult.getAgencyPIds())) {
+        //2022.01.26与社会组织列表一直，查询当前工作人员所属组织建立的社会组织
+        /*if (StringUtils.isNotBlank(staffInfoCacheResult.getAgencyPIds()) && !NumConstant.ZERO_STR.equals(staffInfoCacheResult.getAgencyPIds())) {
             if (staffInfoCacheResult.getAgencyPIds().contains(StrConstant.COLON)) {
                 agencyIds.addAll(Arrays.asList(staffInfoCacheResult.getAgencyPIds().split(StrConstant.COLON)));
             }else{
                 //当前用户属于第二级组织的人，不会有:
                 agencyIds.add(staffInfoCacheResult.getAgencyPIds());
             }
-        }
+        }*/
         agencyIds.add(staffInfoCacheResult.getAgencyId());
         resultList = baseDao.selectListByAgencyId(agencyIds, formDTO.getServiceName(), formDTO.getCustomerId(), formDTO.getQueryPurpose());
         return resultList;