From 47ae9a2a0d8a1196603ddd7835563413bbe14824 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期二, 22 四月 2025 15:14:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-system/src/main/resources/mapper/system/SysDeptMapper.xml | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/aps-modules/aps-system/src/main/resources/mapper/system/SysDeptMapper.xml b/aps-modules/aps-system/src/main/resources/mapper/system/SysDeptMapper.xml
index c4db34b..cb98780 100644
--- a/aps-modules/aps-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/aps-modules/aps-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -20,10 +20,13 @@
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
+ <result property="orgCode" column="org_code" />
</resultMap>
<sql id="selectDeptVo">
- select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time
+ select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,
+ d.del_flag, d.create_by, d.create_time ,
+ d.org_code
from sys_dept d
</sql>
@@ -97,6 +100,7 @@
<if test="email != null and email != ''">email,</if>
<if test="status != null">status,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
+ <if test="orgCode != null and orgCode != ''">org_code,</if>
create_time
)values(
<if test="deptId != null and deptId != 0">#{deptId},</if>
@@ -109,6 +113,7 @@
<if test="email != null and email != ''">#{email},</if>
<if test="status != null">#{status},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
+ <if test="orgCode != null and orgCode != ''">#{orgCode},</if>
now()
)
</insert>
@@ -125,6 +130,7 @@
<if test="email != null">email = #{email},</if>
<if test="status != null and status != ''">status = #{status},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+ <if test="orgCode != null and orgCode != ''">org_code = #{orgCode},</if>
update_time = now()
</set>
where dept_id = #{deptId}
@@ -153,5 +159,13 @@
<delete id="deleteDeptById" parameterType="Long">
update sys_dept set del_flag = '2' where dept_id = #{deptId}
</delete>
+ <select id="selectDeptListByIdList" parameterType="Long" resultMap="SysDeptResult">
+ <include refid="selectDeptVo"/>
+ where d.del_flag = '0' and dept_id in
+ <foreach collection="deptIdList" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
+ order by d.parent_id, d.order_num
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3