管理端群聊

mec-biz/src/main/java/com/ym/mec/biz/dal/page/UserBasicQueryInfo.java

@@ -1,15 +1,30 @@
 package com.ym.mec.biz.dal.page;
 
 import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.ApiModelProperty;
 
 public class UserBasicQueryInfo extends QueryInfo {
 
+    @ApiModelProperty(value = "分部", required = false)
     private String organId;
 
+    @ApiModelProperty(value = "声部编号", required = false)
     private Integer subjectId;
 
+    @ApiModelProperty(value = "乐团编号", required = false)
     private String musicGroupId;
 
+    @ApiModelProperty(value = "群编号（用于排除掉在群里面的用户）", required = false)
+    private String imGroupId;
+
+    public String getImGroupId() {
+        return imGroupId;
+    }
+
+    public void setImGroupId(String imGroupId) {
+        this.imGroupId = imGroupId;
+    }
+
     public String getOrganId() {
         return organId;
     }

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

@@ -448,6 +448,9 @@
             <if test="organId != null and organId != ''">
                 AND INTE_ARRAY(e.organ_id_list_,#{organId})
             </if>
+            <if test="imGroupId != null and imGroupId != ''">
+                AND e.user_id_ NOT IN (SELECT user_id_ FROM im_group_member WHERE im_group_id_ = #{imGroupId})
+            </if>
         </where>
     </sql>
 </mapper>

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

@@ -1458,6 +1458,9 @@
             <if test="musicGroupId != null and musicGroupId != ''">
                 AND sr.music_group_id_ = #{musicGroupId}
             </if>
+            <if test="imGroupId != null and imGroupId != ''">
+                AND s.user_id_ NOT IN (SELECT user_id_ FROM im_group_member WHERE im_group_id_ = #{imGroupId})
+            </if>
         </where>
     </sql>
 </mapper>

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

@@ -1467,6 +1467,9 @@
             <if test="subjectId != null">
                 AND FIND_IN_SET(#{subjectId},t.subject_id_)
             </if>
+            <if test="imGroupId != null and imGroupId != ''">
+                AND s.user_id_ NOT IN (SELECT user_id_ FROM im_group_member WHERE im_group_id_ = #{imGroupId})
+            </if>
         </where>
     </sql>
 </mapper>