Merge remote-tracking branch 'origin/dev_bugfix' into dev

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>

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
+            EXISTS (
-            AND rgm.resi_group_id = ALL (
             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 -->