Merge branch 'feature/0812_opt' into develop-new

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/ClientEnum.java

@@ -10,10 +10,10 @@ import com.yonge.toolset.base.enums.BaseEnum;
  * @date 2022-04-28
  */
 public enum ClientEnum implements BaseEnum<String, ClientEnum> {
-    TEACHER("老师端"),
-    STUDENT("学生端"),
-    TENANT_STUDENT("机构-学生端"),
-    TENANT_TEACHER("机构-老师端"),
+    TEACHER("平台老师"),
+    STUDENT("平台学生"),
+    TENANT_STUDENT("机构学生"),
+    TENANT_TEACHER("机构老师"),
     ORGANIZATION("机构-小程序"),
     SYSTEM("平台端"),
     WEBSITE("官网"),

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherServiceImpl.java

@@ -735,7 +735,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         // 重置学生关联客服绑定
         studentService.update(null, new UpdateWrapper<Student>().lambda()
                 .eq(Student::getImCustomerId, imCustomerServiceId)
-                .set(Student::getImCustomerId, imCustomerServiceId)
+                .set(Student::getImCustomerId, "")
                 .set(Student::getCustomerId, null));
     }
 

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

@@ -181,6 +181,7 @@
             <if test="param.search != null and param.search !=''">
                 and  (
                     cg.id_ like concat('%',#{param.search},'%')
+                    or cg.name_ like concat('%',#{param.search},'%')
                     or su.id_ like concat('%',#{param.search},'%')
                     or su.username_ like concat('%',#{param.search},'%')
                     or su.phone_  like concat('%',#{param.search},'%')

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

@@ -63,7 +63,7 @@
         SELECT t1.id_ AS userId, t1.username_ FROM sys_user t1
         <if test="param.clientType != null">
             <if test="param.clientType.code == 'TEACHER'"> LEFT JOIN teacher t2 ON (t1.id_ = t2.user_id_)</if>
-            <if test="param.clientType.code == 'STUDENT'"> LEFT JOIN student t2 ON (t1.id_ = t2.user_id_)</if>
+            <if test="param.clientType.code == 'STUDENT'"> LEFT JOIN student t2 ON (t1.id_ = t2.user_id_ and t2.hide_flag_ = 0)</if>
         </if>
         <where>
             <if test="param.subjectIds != null">