From 83953fac1e778b6de84efaa09bc6913fed2e0b12 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 29 十月 2024 16:48:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/ClassesUserMapper.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/ClassesUserMapper.xml b/src/main/resources/mapper/ClassesUserMapper.xml
index d9a7f98..10be910 100644
--- a/src/main/resources/mapper/ClassesUserMapper.xml
+++ b/src/main/resources/mapper/ClassesUserMapper.xml
@@ -54,7 +54,7 @@
TU.status
FROM t_classes_user TCU
LEFT JOIN t_user TU ON TU.id = TCU.user_id and TU.deleted = 0
- WHERE TCU.deleted = 0 AND TCU.classes_id = #{query.classesId}
+ WHERE TCU.deleted = 0 AND TCU.classes_id = #{query.classesId} AND TCU.teacher = 0
<if test="query.studentName != null and query.studentName != ''">AND TU.real_name like concat('%',
#{query.studentName}, '%')
</if>
@@ -71,13 +71,19 @@
t_classes_user TCU
INNER JOIN t_user TU ON TU.id = TCU.user_id AND TCU.classes_id = #{classesId}
WHERE
- TCU.deleted = 0
+ TCU.deleted = 0 AND TCU.teacher = 0
</select>
<select id="getClassesByUserId" resultType="java.lang.Integer">
select classes_id
from t_classes_user
- where user_id = #{userId} and deleted = 0
+ where user_id = #{userId} and deleted = 0 and teacher = 0
+ </select>
+
+ <select id="getClassesByUserId1" resultType="com.ycl.jxkg.domain.vo.ClassesVO">
+ select distinct tc.id, tc.class_name
+ from t_classes_user tcu inner join t_classes tc ON tcu.classes_id = tc.id
+ and tcu.user_id = #{userId} and tcu.teacher = 0
</select>
<select id="getClassesNameByUserId" resultType="java.lang.String">
--
Gitblit v1.8.0