From d0bf6e62c0bafa4dce4d9d2181f5a93ae819ae57 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 30 Jun 2022 10:03:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E7=82=B9?=
 =?UTF-8?q?=EF=BC=8C=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B=E7=82=B9=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcPointNucleicMonitoringServiceImpl.java  | 7 +++++++
 .../main/resources/mapper/IcPointNucleicMonitoringDao.xml  | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java
index 59443b21eb..69929d807d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java
@@ -131,6 +131,13 @@ public class IcPointNucleicMonitoringServiceImpl extends BaseServiceImpl<IcPoint
         if (addressList.contains(dto.getName())){
             throw new RenException("该监测点名称已存在，请重新输入");
         }
+        if(StringUtils.isNotBlank(dto.getOrgName())){
+            // 赋值pid  pids
+            Result<CommunityInfoResultDTO> resultDTOResult = govOrgFeignClient.getCommunityInfo(dto.getOrgName());
+            CommunityInfoResultDTO communityInfoResultDTO = resultDTOResult.getData();
+            dto.setPid(communityInfoResultDTO.getPid());
+            dto.setPids(communityInfoResultDTO.getPids());
+        }
         IcPointNucleicMonitoringEntity entity = ConvertUtils.sourceToTarget(dto, IcPointNucleicMonitoringEntity.class);
         insert(entity);
     }
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml
index 42a4a2e8af..23ea0af5d8 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml
@@ -94,7 +94,7 @@
             and MOBILE like CONCAT('%', #{mobile}, '%')
         </if>
         <if test="orgId != null and orgId != ''">
-            and (ORG_ID = #{orgId} or FIND_IN_SET(#{orgId},PIDS))
+            and (ORG_ID = #{orgId} or PIDS like CONCAT('%',#{orgId},'%'))
         </if>
         order by CREATED_TIME desc
     </select>