九小场所列表查询调整

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EnterprisePageFormDTO.java

@@ -10,6 +10,19 @@ import java.io.Serializable;
  */
 @Data
 public class EnterprisePageFormDTO implements Serializable {
+
+    /**
+     * 组织id或者网格id
+     * 04.10添加次入参，原型地址：https://modao.cc/app/DUshpXWirii6amoDQsb8OP#screen=slfbvzaghxlqxhe
+     */
+    private String orgId;
+    /**
+     * 组织：agency
+     * 网格：grid
+     * 04.10添加次入参，原型地址：https://modao.cc/app/DUshpXWirii6amoDQsb8OP#screen=slfbvzaghxlqxhe
+     */
+    private String orgType;
+
     /**
      * 场所区域
      */

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml

@@ -66,10 +66,18 @@
             LEFT JOIN ic_enterprise_patrol_record r ON ( ie.id = r.ENTERPRISE_ID AND r.DEL_FLAG = '0' )
         WHERE
             ie.DEL_FLAG = '0'
-            AND (
+            <if test='"grid" == orgType'>
-                ie.AGENCY_ID = #{staffAgencyId}
+                AND ie.GRID_ID = #{orgId}
-                OR ie.AGENCY_PIDS LIKE concat( '%', #{staffAgencyId}, '%' )
+            </if>
-            )
+            <if test='"agency" == orgType'>
+                AND (ie.AGENCY_ID = #{orgId} or ie.AGENCY_PIDS like concat('%',#{orgId},'%'))
+            </if>
+            <if test='null==orgType or "" == orgType'>
+                AND (
+                    ie.AGENCY_ID = #{staffAgencyId}
+                    OR ie.AGENCY_PIDS LIKE concat( '%', #{staffAgencyId}, '%' )
+                )
+            </if>
             <if test='null != gridId and "" != gridId'>
                 AND ie.GRID_ID = #{gridId}
             </if>