From c611e46b3d859a4e22e978bd21fa346b8b2e73b4 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Mon, 1 Jun 2020 17:22:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1.=E6=9A=82=E6=97=B6=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E6=8E=89flyway=E4=BE=9D=E8=B5=96=EF=BC=8C=E5=90=8E=E9=9D=A2?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-commons/epmet-commons-mybatis/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-commons/epmet-commons-mybatis/pom.xml b/epmet-commons/epmet-commons-mybatis/pom.xml
index 502ef21e81..c03f46da90 100644
--- a/epmet-commons/epmet-commons-mybatis/pom.xml
+++ b/epmet-commons/epmet-commons-mybatis/pom.xml
@@ -72,10 +72,10 @@
         </dependency>
 
         <!--flyway 数据库迁移工具-->
-        <dependency>
+        <!--<dependency>
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-core</artifactId>
-        </dependency>
+        </dependency>-->
     </dependencies>
 
     <build>

From 8de13746aa686a3cdf47e588c46968d89a552341 Mon Sep 17 00:00:00 2001
From: zxc <954985706@qq.com>
Date: Mon, 1 Jun 2020 17:57:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=8A=A0=E5=85=A5=E5=B0=8F=E7=BB=84=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/group/ResiGroupDao.xml     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
index e316a46efd..119db46b30 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
@@ -285,17 +285,18 @@
         FROM
             resi_group_member rgm
         WHERE
-            rgm.del_flag = 0
-            AND rgm.resi_group_id = ALL (
+            EXISTS (
             SELECT
                 rg.id
             FROM
                 resi_group rg
             WHERE
                 rg.del_flag = 0
+                AND rgm.resi_group_id = rg.id
                 AND rg.grid_id = #{gridId}
-                AND rgm.resi_group_id = rg.id )
-            AND rgm.customer_user_id = #{userId}
+            )
+            AND rgm.CUSTOMER_USER_ID = #{userId}
+            AND rgm.del_flag = 0
     </select>
 
     <!-- 查询一个网格下面所有组Id -->