From 1a00df812740751806e6d17a7b5a184fe97157d4 Mon Sep 17 00:00:00 2001
From: lohir <3399054449@qq.com>
Date: 星期五, 18 十月 2024 17:14:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/ClassesUserMapper.xml | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/ClassesUserMapper.xml b/src/main/resources/mapper/ClassesUserMapper.xml
index 7306815..05d0369 100644
--- a/src/main/resources/mapper/ClassesUserMapper.xml
+++ b/src/main/resources/mapper/ClassesUserMapper.xml
@@ -45,7 +45,7 @@
TU.sex,
TU.phone
FROM t_classes_user TCU
- LEFT JOIN t_user TU ON TU.id = TCU.user_id
+ 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}
<if test="query.studentName != null and query.studentName != ''">AND TU.real_name like concat('%',
#{query.studentName}, '%')
@@ -70,4 +70,11 @@
from t_classes_user
where user_id = #{userId} and deleted = 0
</select>
+
+ <select id="getClassesNameByUserId" resultType="java.lang.String">
+ select tc.class_name
+ from t_classes_user tcu
+ left join t_classes tc on tcu.classes_id = tc.id
+ where user_id = #{userId} and tcu.deleted = 0 and tc.deleted =0
+ </select>
</mapper>
--
Gitblit v1.8.0