From 13f796dc50449ae2ec525ef02aaf4b49a91a564b Mon Sep 17 00:00:00 2001
From: qirong <2032486488@qq.com>
Date: 星期三, 29 十一月 2023 11:16:42 +0800
Subject: [PATCH] 修改重置

---
 src/main/resources/mapper/SubjectMapper.xml |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/SubjectMapper.xml b/src/main/resources/mapper/SubjectMapper.xml
index 2d12715..c8a6464 100644
--- a/src/main/resources/mapper/SubjectMapper.xml
+++ b/src/main/resources/mapper/SubjectMapper.xml
@@ -16,7 +16,7 @@
     select 
     <include refid="Base_Column_List" />
     from t_subject
-    where id = #{id,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER} and deleted = 0
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
     delete from t_subject
@@ -108,7 +108,7 @@
   <select id="getSubjectByLevel" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List"/>
-    from t_subject where level= #{level}
+    from t_subject where level= #{level} and deleted = 0
     order by item_order
   </select>
 
@@ -116,7 +116,7 @@
   <select id="allSubject" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List"/>
-    from t_subject
+    from t_subject where deleted = 0
   </select>
 
   <select id="page" resultMap="BaseResultMap" parameterType="com.mindskip.xzs.viewmodel.admin.education.SubjectPageRequestVM">
@@ -132,7 +132,7 @@
         and level= #{level}
       </if>
       <if test="name != null ">
-        and level_name like concat('%',#{name},'%')
+        and name like concat('%',#{name},'%')
       </if>
     </where>
   </select>
@@ -141,7 +141,7 @@
       SELECT
       <include refid="Base_Column_List"/>
       FROM t_subject
-      where name = #{name}
+      where name = #{name} and deleted = 0
   </select>
 
   <select id="getNames" resultMap="BaseResultMap">
@@ -153,7 +153,21 @@
              close=")">
       #{name}
     </foreach>
+    and deleted = 0
 
   </select>
 
+  <select id="selectByIds" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from t_subject
+    where id in
+    <foreach item="id" collection="ids" open="(" separator=","
+             close=")">
+      #{id}
+    </foreach>
+    and deleted = 0
+  </select>
+
+
 </mapper>

--
Gitblit v1.8.0