From 47cd9ecc0eff38ffe6b3b794b2bf197e958f4403 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 14 五月 2025 15:50:57 +0800
Subject: [PATCH] bug：学员有状态不能修改问题
---
src/main/resources/mapper/SubjectMapper.xml | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/SubjectMapper.xml b/src/main/resources/mapper/SubjectMapper.xml
index c7b6258..ee0a8b0 100644
--- a/src/main/resources/mapper/SubjectMapper.xml
+++ b/src/main/resources/mapper/SubjectMapper.xml
@@ -25,9 +25,9 @@
where id = #{id,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.mindskip.xzs.domain.Subject" useGeneratedKeys="true" keyProperty="id">
- insert into t_subject (id, name, level,
+ insert into t_subject (name, level,
level_name, item_order, deleted)
- values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{level,jdbcType=INTEGER},
+ values (#{name,jdbcType=VARCHAR}, #{level,jdbcType=INTEGER},
#{levelName,jdbcType=VARCHAR}, #{itemOrder,jdbcType=INTEGER}, #{deleted,jdbcType=BIT})
</insert>
<insert id="insertSelective" parameterType="com.mindskip.xzs.domain.Subject" useGeneratedKeys="true"
@@ -116,9 +116,9 @@
<select id="allSubject" resultMap="BaseResultMap">
select
- ts.id, ts.name
+ DISTINCT ts.id, ts.name
from t_subject ts
- <if test="deptIds != null and deptIds.size > 0">
+ <if test="admin == false and deptIds != null and deptIds.size > 0">
INNER JOIN t_subject_dept tsd ON tsd.subject_id = ts.id
AND tsd.dept_id IN
<foreach collection="deptIds" open="(" separator="," close=")" item="deptId">#{deptId}</foreach>
@@ -126,6 +126,34 @@
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="selectByName" resultType="com.mindskip.xzs.domain.Subject">
+ SELECT
+ name
+ FROM
+ t_subject
+ WHERE
+ name = #{name} AND deleted = 0
+ <if test="id != null">
+ AND id != #{id}
+ </if>
+ limit 1
+ </select>
+
+
+ <select id="getByName" resultType="com.mindskip.xzs.domain.Subject">
+ SELECT * FROM t_subject WHERE name = #{name} AND deleted = 0
+ </select>
+
+
<select id="page" resultMap="BaseResultMap"
parameterType="com.mindskip.xzs.viewmodel.admin.education.SubjectPageRequestVM">
SELECT
--
Gitblit v1.8.0