是否本地居民的pids修改

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java

@@ -703,28 +703,28 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
     /**
      * 创建nat关系
      * @param natId
-     * @param currentUserAgencyId 居民所属组织
+     * @param currentResiAgencyId 居民所属组织
      * @param staffAgencyId 工作人员所属组织
      * @param agencyPids 工作人员所属组织路径
      */
-    private void createNatRelation(String natId, String currentUserAgencyId, String agencyPids,String staffAgencyId) {
+    private void createNatRelation(String natId, String currentResiAgencyId, String agencyPids,String staffAgencyId) {
 
         // 没有关系创建关系，有关系就跳过
         // 2022-10-25 修改：不管是不是本辖区居民，都创建关系，用 is_local_resi_user区分是不是本辖区居民
         // 组织ID都改成工作人员所属组织ID
         LambdaQueryWrapper<IcNatRelationEntity> query = new LambdaQueryWrapper<>();
         query.eq(IcNatRelationEntity::getIcNatId, natId);
-        query.eq(IcNatRelationEntity::getAgencyId, currentUserAgencyId);
+        query.eq(IcNatRelationEntity::getAgencyId, currentResiAgencyId);
         if (icNatRelationDao.selectCount(query) > 0) {
             return;
         }
 
         IcNatRelationEntity relation = new IcNatRelationEntity();
-        relation.setAgencyId(currentUserAgencyId);
+        relation.setAgencyId(currentResiAgencyId);
-        relation.setPids(String.join(":", Arrays.asList(agencyPids, currentUserAgencyId)));
+        relation.setPids(String.join(":", Arrays.asList(agencyPids, staffAgencyId)));
         relation.setIcNatId(natId);
         relation.setUserType("import");
-        relation.setIsLocalResiUser(agencyPids.contains(currentUserAgencyId) ? NumConstant.ONE_STR : NumConstant.ZERO_STR);
+        relation.setIsLocalResiUser(agencyPids.contains(currentResiAgencyId) ? NumConstant.ONE_STR : NumConstant.ZERO_STR);
         icNatRelationDao.insert(relation);
     }