From 0a2d4fd4aeef4c669c5f59b5aaa82cec3fd17f38 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 10 Apr 2023 10:11:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B9=9D=E5=B0=8F=E5=9C=BA=E6=89=80=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../epmet/dto/form/EnterprisePageFormDTO.java | 13 +++++++++++++
.../main/resources/mapper/IcEnterpriseDao.xml | 16 ++++++++++++----
2 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EnterprisePageFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EnterprisePageFormDTO.java
index 15bf7a402a..623af190db 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EnterprisePageFormDTO.java
+++ b/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;
+
/**
* 场所区域
*/
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml
index faf1414459..029fb23169 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml
+++ b/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 (
- ie.AGENCY_ID = #{staffAgencyId}
- OR ie.AGENCY_PIDS LIKE concat( '%', #{staffAgencyId}, '%' )
- )
+
+ AND ie.GRID_ID = #{orgId}
+
+
+ AND (ie.AGENCY_ID = #{orgId} or ie.AGENCY_PIDS like concat('%',#{orgId},'%'))
+
+
+ AND (
+ ie.AGENCY_ID = #{staffAgencyId}
+ OR ie.AGENCY_PIDS LIKE concat( '%', #{staffAgencyId}, '%' )
+ )
+
AND ie.GRID_ID = #{gridId}