ソースを参照

Merge branch 'dev_v1.3.5_20220927'

Eric 2 年 前
コミット
ec053c437c

+ 1 - 4
cooleshow-user/user-biz/src/main/resources/config/mybatis/ImGroupMapper.xml

@@ -80,15 +80,12 @@
                CASE WHEN igm.id_ IS NULL THEN 0 ELSE 1 END existFlag,
                CASE WHEN igma.id_ IS NULL THEN 0 ELSE 1 END hasWaitAuditFlag
         FROM im_group ig
-                 LEFT JOIN im_group_member igm ON (ig.id_ = igm.group_id_ AND igm.user_id_ = #{imGroupDto.userId})
+                 LEFT JOIN im_group_member igm ON (ig.id_ = igm.group_id_ AND igm.user_id_ = #{imGroupDto.userId} <if test="imGroupDto.roleType != null"> AND igm.role_type_ = #{imGroupDto.roleType} </if>)
                  LEFT JOIN im_group_member_audit igma ON igma.group_id_ = ig.id_ AND igma.audit_status_ = 'AUDITING' AND igma.user_id_ = igm.user_id_
         WHERE ig.create_by_ = #{imGroupDto.createUserId}
         <if test="imGroupDto.type != null and imGroupDto.type != ''">
             AND ig.type_ = #{imGroupDto.type}
         </if>
-        <if test="imGroupDto.roleType != null">
-            AND igm.role_type_ = #{imGroupDto.roleType}
-        </if>
         <if test="imGroupDto.search != null and imGroupDto.search != ''">
             AND (ig.id_ = #{imGroupDto.search} OR
             ig.name_ LIKE CONCAT('%',#{imGroupDto.search},'%') OR ig.introduce_ LIKE CONCAT('%',#{imGroupDto.search},'%'))

+ 1 - 1
service.md

@@ -1,7 +1,7 @@
 - [ ] gateway-server
 - [ ] auth-server
 - [ ] admin-server
-- [x] teacher-server
+- [ ] teacher-server
 - [x] student-server
 - [ ] website-server
 - [ ] task-server