liujc 10 months ago
parent
commit
fa2a68a33c

+ 4 - 4
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("官网"),

+ 1 - 1
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">