From 8d42b23c07433f11cb0b1e16d9c74b0e29fd35ce Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 05 七月 2024 09:57:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/resources/mapper/ClassesMapper.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/ClassesMapper.xml b/src/main/resources/mapper/ClassesMapper.xml
index 2b6455b..302924c 100644
--- a/src/main/resources/mapper/ClassesMapper.xml
+++ b/src/main/resources/mapper/ClassesMapper.xml
@@ -10,7 +10,7 @@
<result column="phone" property="teacherPhone" />
<result column="create_time" property="createTime" />
<result column="classes_number" property="classesNumber" />
- <result column="status" property="status" />
+ <result column="status" property="status" typeHandler="com.baomidou.mybatisplus.core.handlers.MybatisEnumTypeHandler"/>
<result column="verify_status" property="verifyStatus" />
<result column="start_time" property="startTime" />
<result column="end_time" property="endTime" />
@@ -63,7 +63,13 @@
t_classes TC
LEFT JOIN t_user TU ON TU.id = TC.create_user AND TU.deleted = 0
WHERE
- TC.deleted = 0
+ TC.deleted = 0 AND TC.create_user = #{query.userId}
+ <if test="query.className != null and query.className != ''">
+ AND TC.class_name like concat('%', #{query.className}, '%')
+ </if>
+ <if test="query.status != null and query.status != ''">
+ AND TC.status = #{query.status}
+ </if>
</select>
</mapper>
--
Gitblit v1.8.0