用户群列表，增加群身份匹配

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/ImGroupSearchDto.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dto;
 
 
+import com.yonge.cooleshow.biz.dal.enums.ImGroupMemberRoleType;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotNull;
@@ -19,6 +20,9 @@ public class ImGroupSearchDto {
     @ApiModelProperty(value = "创建人(群创建者)")
     private Long createUserId;
 
+    @ApiModelProperty(value = "群角色TEACHER老师、STUDENT学生")
+    private ImGroupMemberRoleType roleType;
+
     public String getType() {
         return type;
     }
@@ -50,5 +54,13 @@ public class ImGroupSearchDto {
     public void setUserId(Long userId) {
         this.userId = userId;
     }
+
+    public ImGroupMemberRoleType getRoleType() {
+        return roleType;
+    }
+
+    public void setRoleType(ImGroupMemberRoleType roleType) {
+        this.roleType = roleType;
+    }
 }
 

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

@@ -61,6 +61,9 @@
             <if test="imGroupDto.userId != null">
                 AND igm.user_id_ = #{imGroupDto.userId}
             </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},'%'))

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/ImGroupController.java

@@ -6,6 +6,7 @@ import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.ImGroupResultDto;
 import com.yonge.cooleshow.biz.dal.dto.ImGroupSearchDto;
 import com.yonge.cooleshow.biz.dal.entity.ImGroup;
+import com.yonge.cooleshow.biz.dal.enums.ImGroupMemberRoleType;
 import com.yonge.cooleshow.biz.dal.service.ImGroupService;
 import com.yonge.cooleshow.biz.dal.service.SysUserService;
 import com.yonge.cooleshow.common.controller.BaseController;
@@ -71,6 +72,9 @@ public class ImGroupController extends BaseController {
     public HttpResponseResult<List<ImGroup>> queryAll(@Valid @RequestBody ImGroupSearchDto imGroupSearchDto, BindingResult bindingResult) throws Exception {
         ValidationKit.ignoreFields(bindingResult,"createUserId");
         imGroupSearchDto.setUserId(sysUserService.getUserId());
+
+        // 设置群组成员身份
+        imGroupSearchDto.setRoleType(ImGroupMemberRoleType.STUDENT);
         return succeed(imGroupService.queryAll(imGroupSearchDto));
     }
 

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/ImGroupController.java

@@ -4,6 +4,7 @@ package com.yonge.cooleshow.teacher.controller;
 import com.yonge.cooleshow.biz.dal.dto.ImGroupResultDto;
 import com.yonge.cooleshow.biz.dal.dto.ImGroupSearchDto;
 import com.yonge.cooleshow.biz.dal.entity.ImGroup;
+import com.yonge.cooleshow.biz.dal.enums.ImGroupMemberRoleType;
 import com.yonge.cooleshow.biz.dal.service.ImGroupService;
 import com.yonge.cooleshow.biz.dal.service.SysUserService;
 import com.yonge.cooleshow.common.controller.BaseController;
@@ -77,6 +78,9 @@ public class ImGroupController extends BaseController {
     public HttpResponseResult<List<ImGroup>> queryAll(@Valid @RequestBody ImGroupSearchDto imGroupSearchDto, BindingResult bindingResult) throws Exception {
         ValidationKit.ignoreFields(bindingResult,"createUserId");
         imGroupSearchDto.setUserId(sysUserService.getUserId());
+        // 设置群组成员身份
+        imGroupSearchDto.setRoleType(ImGroupMemberRoleType.STUDENT);
+
         return succeed(imGroupService.queryAll(imGroupSearchDto));
     }