恢复用户是否加入群的标识

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/dao/UserGroupDao.java

@@ -137,13 +137,4 @@ public interface UserGroupDao extends BaseDao<UserGroupEntity> {
      */
     void updateRemoveGroupOwner(GroupToAdminFormDTO formDTO);
 
-
-    /***
-     * 移除此群群主
-     * @param userId groupId
-     * @return void
-     * @author qushutong
-     * @date 2020/5/12 9:10
-     */
-    UserGroupEntity selectGroupUserState(@Param("userId") String userId, @Param("groupId") String groupId);
 }

epdc-cloud-property/src/main/resources/mapper/smile/group/GroupDao.xml

@@ -494,12 +494,22 @@ ORDER BY
         gp.id,
         gp.GROUP_NAME,
         gp.GROUP_AVATAR,
-        gp.STATE AS GROUP_STATE
+        gp.STATE AS GROUP_STATE,
+        CASE
+        WHEN ug.STATE = 10 THEN
+        2
+        WHEN ug.STATE = 0 THEN
+        1
+        ELSE
+        0
+        END AS groupMemberFlag
         FROM
-            epdc_group gp
+        epdc_group gp
+        LEFT JOIN epdc_user_group ug ON gp.id = ug.GROUP_ID
+        AND ug.USER_ID = #{userId}
         WHERE
-            gp.DEL_FLAG = '0'
-        AND gp.STATE IN ( 10, 15 )
+        gp.DEL_FLAG = '0'
+        AND gp.STATE IN (10, 15)
         <if test="sectionCode != null and sectionCode != ''">
             AND gp.SECTION_CODE = #{sectionCode}
         </if>
@@ -507,6 +517,8 @@ ORDER BY
         <foreach item="dept" collection="deptList" open="(" separator="," close=")">
             #{dept}
         </foreach>
+        GROUP BY
+        gp.ID
     </select>
 
 </mapper>

epdc-cloud-property/src/main/resources/mapper/smile/group/UserGroupDao.xml

@@ -118,16 +118,4 @@
         update epdc_user_group ug SET LORD_FLAG = 0,UPDATED_TIME =NOW() WHERE ug.GROUP_ID = #{groupId} AND ug.LORD_FLAG = 1
     </update>
 
-    <select id="selectGroupUserState" resultType="com.elink.esua.epdc.modules.smile.group.entity.UserGroupEntity">
-        SELECT
-        USER_ID,
-        STATE
-        FROM
-        epdc_user_group
-        WHERE
-        DEL_FLAG = '0'
-        AND GROUP_ID = #{groupId}
-        AND USER_ID = #{userId}
-    </select>
-
 </mapper>