From 7cd87e30ed364aa6806eaa28939ea94ad1524a50 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 08 三月 2024 14:46:50 +0800
Subject: [PATCH] 部门增加管理员

---
 src/main/resources/mapper/DepartmentMapper.xml |   64 +++++++++++++++++++++++---------
 1 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/src/main/resources/mapper/DepartmentMapper.xml b/src/main/resources/mapper/DepartmentMapper.xml
index 7146268..5eee8cd 100644
--- a/src/main/resources/mapper/DepartmentMapper.xml
+++ b/src/main/resources/mapper/DepartmentMapper.xml
@@ -13,8 +13,8 @@
     </sql>
 
     <insert id="add" parameterType="com.mindskip.xzs.domain.Department" useGeneratedKeys="true" keyProperty="id">
-        insert into t_department (name, deleted)
-        values (#{name,jdbcType=VARCHAR}, #{deleted,jdbcType=VARCHAR})
+        insert into t_department (name, admin_id, deleted)
+        values (#{name,jdbcType=VARCHAR}, {#{adminId}, #{deleted,jdbcType=VARCHAR})
     </insert>
 
     <update id="update" parameterType="com.mindskip.xzs.domain.Department">
@@ -22,6 +22,9 @@
         <set>
             <if test="name != null">
                 name = #{name,jdbcType=VARCHAR},
+            </if>
+            <if test="adminId != null">
+                admin_id = #{adminId},
             </if>
             <if test="deleted != null">
                 deleted = #{deleted,jdbcType=VARCHAR},
@@ -31,38 +34,63 @@
     </update>
 
     <select id="gets" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List"/>
-        from t_department where deleted=0
+        SELECT
+            td.id,
+            td.name,
+            td.admin_id as adminId,
+            tu.real_name as adminName
+        FROM
+            t_department td
+                LEFT JOIN t_user tu ON td.admin_id = tu.id AND tu.deleted = 0
+        WHERE
+            td.deleted = 0
     </select>
 
     <select id="getById" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List"/>
-        from t_department where deleted=0
-        and id = #{id}
+        SELECT
+            td.id,
+            td.name,
+            td.admin_id as adminId,
+            tu.real_name as adminName
+        FROM
+            t_department td
+                LEFT JOIN t_user tu ON td.admin_id = tu.id AND tu.deleted = 0
+        WHERE
+              td.id = #{id} AND td.deleted = 0
     </select>
 
-    <select id="page" resultMap="BaseResultMap"
+    <select id="page" resultType="com.mindskip.xzs.viewmodel.admin.department.DepartmentResponseVM"
             parameterType="com.mindskip.xzs.viewmodel.admin.department.DepartmentResponseVM">
         SELECT
-        <include refid="Base_Column_List"/>
-        FROM t_department
+            td.id,
+            td.name,
+            td.admin_id as adminId,
+            tu.real_name as adminName
+        FROM
+             t_department td
+                 LEFT JOIN t_user tu ON td.admin_id = tu.id AND tu.deleted = 0
         <where>
-            and deleted=0
+            AND td.deleted = 0
             <if test="id != null ">
-                and id= #{id}
+                AND td.id= #{id}
             </if>
             <if test="name != null ">
-                and name like concat('%',#{name},'%')
+                AND td.name like concat('%',#{name},'%')
             </if>
 
         </where>
     </select>
 
     <select id="getName" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List"/>
-        from t_department where deleted=0 and name = #{name}
+        SELECT
+            td.id,
+            td.name,
+            td.admin_id as adminId,
+            tu.real_name as adminName
+        FROM
+            t_department td
+                LEFT JOIN t_user tu ON td.admin_id = tu.id AND tu.deleted = 0
+        WHERE
+            td.name = #{name} AND td.deleted = 0
     </select>
 </mapper>

--
Gitblit v1.8.0