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>