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 5ccd3cdb7d..760a420020 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 @@ -155,7 +155,10 @@ FROM resi_group rg LEFT JOIN resi_group_statistical rgs ON ( rg.id = rgs.RESI_GROUP_ID ) - LEFT JOIN resi_group_member rgm ON ( rg.id = rgm.RESI_GROUP_ID AND rgm.CUSTOMER_USER_ID =#{userId}) + LEFT JOIN resi_group_member rgm + ON ( rg.id = rgm.RESI_GROUP_ID + AND rgm.DEL_FLAG='0' + AND rgm.CUSTOMER_USER_ID =#{userId}) WHERE rg.DEL_FLAG = '0' AND rgs.DEL_FLAG = '0' @@ -188,10 +191,9 @@ rg.* FROM resi_group rg - LEFT JOIN resi_group_member rgm ON ( rg.id = rgm.RESI_GROUP_ID ) + LEFT JOIN resi_group_member rgm ON ( rg.id = rgm.RESI_GROUP_ID AND rgm.DEL_FLAG = '0') WHERE rg.DEL_FLAG = '0' - AND rgm.DEL_FLAG = '0' AND rgm.GROUP_LEADER_FLAG = 'leader' AND rgm.CUSTOMER_USER_ID = #{userId} AND rg.GROUP_NAME = #{groupName}