From 6019fd9122717eee9a7f982152531836a07d1582 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Sun, 18 Jul 2021 21:58:21 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9ASQL=E8=AF=AD?=
 =?UTF-8?q?=E6=B3=95=E6=BC=8F=E6=B4=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/GovStaffRoleDao.xml      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml
index 42ad1a45ab..7712a0b58c 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml
@@ -132,11 +132,13 @@
             gov_staff_role
         WHERE
             DEL_FLAG = 0
-          AND (
-              <foreach collection="roleIds" item="roleId" separator=" OR ">
-                  ID = #{roleId}
-              </foreach>
+        <if test="roleIds != null and roleIds.size() > 0">
+            AND (
+            <foreach collection="roleIds" item="roleId" separator=" OR ">
+                ID = #{roleId}
+            </foreach>
             )
+        </if>
     </select>
     <select id="getStaffRoles" resultType="com.epmet.entity.GovStaffRoleEntity">
         SELECT

From f3b3f19a89bc68c5ba31735c7c2695bf4f9764e0 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 19 Jul 2021 09:10:24 +0800
Subject: [PATCH 2/3] =?UTF-8?q?/resi/mine/mygrid/allgrids=E5=B1=85?=
 =?UTF-8?q?=E6=B0=91=E7=AB=AF=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E8=AE=BF?=
 =?UTF-8?q?=E9=97=AE=E8=BF=87=E7=9A=84=E7=BD=91=E6=A0=BC,=E9=99=90?=
 =?UTF-8?q?=E5=88=B6customer=5Fgrid.SYNC=5FFLAG=3D'1'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gov-org-server/src/main/resources/mapper/CustomerGridDao.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index 2036e76fa6..32ed164aa5 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -314,6 +314,7 @@
         INNER JOIN customer_agency ca ON cg.pid = ca.id
         WHERE cg.del_flag = '0'
         AND ca.del_flag = '0'
+        AND cg.SYNC_FLAG='1'
         AND cg.id IN
         <foreach item="id" collection="gridIdList" open="(" separator="," close=")">
             #{id}

From 7fef7351b8a40da234601dc8ae47ef9eec73315e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 19 Jul 2021 09:23:21 +0800
Subject: [PATCH 3/3] =?UTF-8?q?/resi/guide/stranger/publiclocationgridlist?=
 =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E5=8E=BB=E5=85=B6=E4=BB=96=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC=E7=9C=8B=E7=9C=8B,=E9=99=90=E5=88=B6customer=5Fgrid.S?=
 =?UTF-8?q?YNC=5FFLAG=3D'1'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/CustomerGridDao.xml               | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index 32ed164aa5..d0663c1a75 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -429,6 +429,7 @@
         ) agency ON grid.PID = agency.ID
        WHERE
            grid.del_flag = 0
+           and grid.SYNC_FLAG='1'
             <if test='areaCode != "" and areaCode != null'>
                AND grid.area_code LIKE CONCAT(#{areaCode},'%')
             </if>
@@ -468,6 +469,7 @@
                 ) agency ON a.PID = agency.ID
                 WHERE
                     a.del_flag = 0
+                    and a.SYNC_FLAG='1'
                     AND a.customer_id = #{customerId}
             ) AS c
          ORDER BY  CONVERT ( gridName USING gbk ) ASC