From 0e5a8aec6cdd998e1db7f5aa8e1b020f1c97573a Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期四, 30 五月 2024 11:20:47 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/resources/mapper/SubjectMapper.xml | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/main/resources/mapper/SubjectMapper.xml b/src/main/resources/mapper/SubjectMapper.xml index fac9514..b5bfd26 100644 --- a/src/main/resources/mapper/SubjectMapper.xml +++ b/src/main/resources/mapper/SubjectMapper.xml @@ -126,6 +126,16 @@ where ts.deleted = 0 </select> + <select id="listByDeptId" resultMap="BaseResultMap"> + select ts.id, + ts.name + from t_subject ts + INNER JOIN t_subject_dept tsd ON tsd.subject_id = ts.id + AND tsd.dept_id = #{deptId} + where ts.deleted = 0 + </select> + + <select id="page" resultMap="BaseResultMap" parameterType="com.mindskip.xzs.viewmodel.admin.education.SubjectPageRequestVM"> SELECT -- Gitblit v1.8.0