群聊新增类型编辑

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ImGroupDao.java

@@ -18,7 +18,8 @@ public interface ImGroupDao extends BaseDAO<String, ImGroup> {
 	 * @return
 	 */
 	List<ImGroup> queryByUserId(@Param("userId") Integer userId,
-								@Param("search") String search);
+								@Param("search") String search,
+								@Param("groupType") String groupType);
 
 	/**
 	 * 查询群成员列表

mec-biz/src/main/java/com/ym/mec/biz/service/ImGroupService.java

@@ -38,7 +38,7 @@ public interface ImGroupService extends BaseService<String, ImGroup> {
 	 * @param search
 	 * @return
 	 */
-	List<ImGroup> queryByUserId(Integer userId, String search);
+	List<ImGroup> queryByUserId(Integer userId, String search,String groupType);
 
 	/**
 	 * 查询群成员列表

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImGroupServiceImpl.java

@@ -148,8 +148,8 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
 	}
 
     @Override
-    public List<ImGroup> queryByUserId(Integer userId, String search) {
-		return imGroupDao.queryByUserId(userId, search);
+    public List<ImGroup> queryByUserId(Integer userId, String search,String groupType) {
+		return imGroupDao.queryByUserId(userId, search,groupType);
     }
 
     @Override

mec-biz/src/main/resources/config/mybatis/ImGroupMapper.xml

@@ -151,6 +151,9 @@
 		<if test="search != null and search != ''">
 			AND (ig.name_ like concat('%',#{search},'%') or ig.tags_ like concat('%',#{search},'%'))
 		</if>
+		<if test="groupType != null and groupType != ''">
+			AND ig.group_type_ = #{groupType}
+		</if>
 	</select>
 	
 	<select id="queryMemberById" resultMap="ImGroupMemberDto">

mec-student/src/main/java/com/ym/mec/student/controller/ImGroupController.java

@@ -37,13 +37,13 @@ public class ImGroupController extends BaseController {
 
 	@ApiOperation("查询群列表")
 	@GetMapping(value = "/queryGroupList")
-	public Object queryGroupList(String search) {
+	public Object queryGroupList(String search,String groupType) {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (Objects.isNull(sysUser)) {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
 
-		return succeed(imGroupService.queryByUserId(sysUser.getId(), search));
+		return succeed(imGroupService.queryByUserId(sysUser.getId(), search,groupType));
 	}
 
 	@ApiOperation("查询群详情")

mec-teacher/src/main/java/com/ym/mec/teacher/controller/ImGroupController.java

@@ -39,13 +39,13 @@ public class ImGroupController extends BaseController {
 
 	@ApiOperation("查询群列表")
 	@GetMapping(value = "/queryGroupList")
-	public Object queryGroupList(String search) {
+	public Object queryGroupList(String search,String groupType) {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (Objects.isNull(sysUser)) {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
 
-		return succeed(imGroupService.queryByUserId(sysUser.getId(), search));
+		return succeed(imGroupService.queryByUserId(sysUser.getId(), search,groupType));
 	}
 
 	@ApiOperation("查询群详情")

mec-web/src/main/java/com/ym/mec/web/controller/ImGroupController.java

@@ -19,7 +19,6 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
@@ -51,12 +50,12 @@ public class ImGroupController extends BaseController {
 
 	@ApiOperation("查询群列表")
 	@GetMapping(value = "/queryGroupList")
-	public HttpResponseResult<List<ImGroup>> queryGroupList(String search) {
+	public HttpResponseResult<List<ImGroup>> queryGroupList(String search,String groupType) {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (Objects.isNull(sysUser)) {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
-		return succeed(imGroupService.queryByUserId(sysUser.getId(), search));
+		return succeed(imGroupService.queryByUserId(sysUser.getId(), search,groupType));
 	}
 
 	@ApiOperation("查询群详情")