From 8864442f8eab9900b1be036a8e3881e2d46c3598 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 21 Apr 2023 13:54:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=87=87=E9=9B=86=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8bug=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=9A=82=E5=AD=98?=
 =?UTF-8?q?=E4=B8=80=E4=B8=8B=EF=BC=8C=E8=A6=81=E5=8E=BB=E6=94=B9=E5=88=AB?=
 =?UTF-8?q?=E7=9A=84bug=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/entity/IcResiUserEntity.java  |  4 ++--
 .../service/impl/IcResiCollectServiceImpl.java   | 16 +++++++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java
index 7611a80a9f..a78fae885d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java
@@ -42,12 +42,12 @@ public class IcResiUserEntity extends BaseEpmetEntity {
 	private String customerId;
 
     /**
-     *
+     * 组织Id
      */
 	private String agencyId;
 
     /**
-     *
+     * 组织的pids 含agencyId本身
      */
 	private String pids;
 
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
index c519210d7b..bfecfa4671 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
@@ -15,6 +15,7 @@ import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.PidUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IcResiCollectDao;
 import com.epmet.dao.IcResiMemberDao;
@@ -491,8 +492,12 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
                 throw new EpmetException(EpmetErrorCode.ORG_ADD_FAILED.getCode(), errorMsg, errorMsg);
             }
         }
-
-        userEntity.setPids(icResiCollectEntity.getPids() + ":" + icResiCollectEntity.getAgencyId()); // ic_resi_user表的组织的pids 含agencyId本身
+        AgencyInfoCache agencyInfoCache = CustomerOrgRedis.getAgencyInfo(icResiCollectEntity.getAgencyId());
+        if (null == agencyInfoCache) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "所属组织查询异常,agencyId:" + icResiCollectEntity.getAgencyId(), "所属组织查询异常");
+        }
+        // userEntity.setPids(icResiCollectEntity.getPids() + ":" + icResiCollectEntity.getAgencyId()); // ic_resi_user表的组织的pids 含agencyId本身
+        userEntity.setPids(PidUtils.convertPid2OrgIdPath(icResiCollectEntity.getAgencyId(), agencyInfoCache.getPids()));
         userEntity.setAgencyId(icResiCollectEntity.getAgencyId());
         userEntity.setGridId(icResiCollectEntity.getGridId());
         userEntity.setVillageId(icResiCollectEntity.getVillageId());
@@ -547,7 +552,12 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
 
         // 新增人员
         IcResiUserEntity userEntity = new IcResiUserEntity();
-        userEntity.setPids(icResiCollectEntity.getPids() + ":" + icResiCollectEntity.getAgencyId()); // ic_resi_user表的组织的pids 含agencyId本身
+        AgencyInfoCache agencyInfoCache = CustomerOrgRedis.getAgencyInfo(icResiCollectEntity.getAgencyId());
+        if (null == agencyInfoCache) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "所属组织查询异常,agencyId:" + icResiCollectEntity.getAgencyId(), "所属组织查询异常");
+        }
+        // userEntity.setPids(icResiCollectEntity.getPids() + ":" + icResiCollectEntity.getAgencyId()); // ic_resi_user表的组织的pids 含agencyId本身 !!!
+        userEntity.setPids(PidUtils.convertPid2OrgIdPath(icResiCollectEntity.getAgencyId(), agencyInfoCache.getPids()));
         userEntity.setAgencyId(icResiCollectEntity.getAgencyId());
         userEntity.setGridId(icResiCollectEntity.getGridId());
         userEntity.setVillageId(icResiCollectEntity.getVillageId());