Merge branch 'dev_epidemic_situation' into develop

epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml

@@ -43,7 +43,7 @@
             del_flag = '0'
         AND customer_id = #{customerId}
         <if test='null != agencyId and "" != agencyId'>
-            AND pids like concat('%', #{agencyId}, '%')
+            AND (agency_id = #{agencyId} OR pids like concat('%', #{agencyId}, '%'))
         </if>
         <if test='null != name and "" != name'>
             AND name like concat('%', #{name}, '%')