From a62b3bc3ab19d6d0bb1bfddac4696075f7496d82 Mon Sep 17 00:00:00 2001 From: yinzuomei <57602893@qq.com> Date: Tue, 31 Mar 2020 14:32:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=B0=8F=E7=BB=84=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3sql=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi/group/dto/group/form/RecommendGroupFormDTO.java | 2 +- .../src/main/resources/mapper/group/ResiGroupDao.xml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/RecommendGroupFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/RecommendGroupFormDTO.java index 741ed0c9f0..db459a2d9c 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/RecommendGroupFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/RecommendGroupFormDTO.java @@ -30,7 +30,7 @@ public class RecommendGroupFormDTO implements Serializable { * 用户当前所在网格所属客户id */ @NotBlank(message = "客户id不能为空") - private String cusomerId; + private String customerId; /** * 用户当前所在网格id 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 93fd8a0f3a..76dccd3883 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 @@ -71,7 +71,7 @@ WHERE rg.DEL_FLAG = '0' AND rgs.DEL_FLAG = '0' - and rg.id not EXISTS ( + and rg.id not in ( SELECT rgm.RESI_GROUP_ID FROM @@ -81,8 +81,9 @@ AND rgm.`STATUS` !='removed' AND rgm.CUSTOMER_USER_ID = #{userId} ) - and rg.CUSTOMER_ID=#{cusomerId} + and rg.CUSTOMER_ID=#{customerId} and rg.GRID_ID=#{gridId} + and rg.STATE ='approved' order by totalMember desc,rg.LATEST_TOPIC_PUBLISH_DATE desc LIMIT #{pageNo}, #{pageSize}