From 52d0d62c35d01ee73d9dba7b1be99a29adc35ef2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 17 八月 2021 10:45:01 +0800
Subject: [PATCH] update 同步 ruoyi 适配改动
---
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml | 125 ++---------------------------------------
1 files changed, 8 insertions(+), 117 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
index 83c7f98..2f56544 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -23,18 +23,7 @@
</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
from sys_dept d
</sql>
@@ -51,7 +40,9 @@
AND status = #{status}
</if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
- ${params.dataScope}
+ <if test="params.dataScope != null and params.dataScope != ''">
+ AND ( ${params.dataScope} )
+ </if>
order by d.parent_id, d.order_num
</select>
@@ -60,95 +51,11 @@
from sys_dept d
left join sys_role_dept rd on d.dept_id = rd.dept_id
where rd.role_id = #{roleId}
- <if test="deptCheckStrictly">
- and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id =
- rd.dept_id and rd.role_id = #{roleId})
- </if>
+ <if test="deptCheckStrictly">
+ and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId})
+ </if>
order by d.parent_id, d.order_num
</select>
-
- <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
- <include refid="selectDeptVo"/>
- where dept_id = #{deptId}
- </select>
-
- <select id="checkDeptExistUser" parameterType="Long" resultType="int">
- select count(1)
- from sys_user
- where dept_id = #{deptId}
- and del_flag = '0'
- </select>
-
- <select id="hasChildByDeptId" parameterType="Long" resultType="int">
- select count(1)
- from sys_dept
- where del_flag = '0'
- and parent_id = #{deptId} limit 1
- </select>
-
- <select id="selectChildrenDeptById" parameterType="Long" resultMap="SysDeptResult">
- select *
- from sys_dept
- where find_in_set(#{deptId}, ancestors)
- </select>
-
- <select id="selectNormalChildrenDeptById" parameterType="Long" resultType="int">
- select count(*)
- from sys_dept
- where status = 0
- and del_flag = '0'
- and find_in_set(#{deptId}, ancestors)
- </select>
-
- <select id="checkDeptNameUnique" resultMap="SysDeptResult">
- <include refid="selectDeptVo"/>
- where dept_name=#{deptName} and parent_id = #{parentId} limit 1
- </select>
-
- <insert id="insertDept" parameterType="SysDept">
- insert into sys_dept(
- <if test="deptId != null and deptId != 0">dept_id,</if>
- <if test="parentId != null and parentId != 0">parent_id,</if>
- <if test="deptName != null and deptName != ''">dept_name,</if>
- <if test="ancestors != null and ancestors != ''">ancestors,</if>
- <if test="orderNum != null and orderNum != ''">order_num,</if>
- <if test="leader != null and leader != ''">leader,</if>
- <if test="phone != null and phone != ''">phone,</if>
- <if test="email != null and email != ''">email,</if>
- <if test="status != null">status,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
- create_time
- )values(
- <if test="deptId != null and deptId != 0">#{deptId},</if>
- <if test="parentId != null and parentId != 0">#{parentId},</if>
- <if test="deptName != null and deptName != ''">#{deptName},</if>
- <if test="ancestors != null and ancestors != ''">#{ancestors},</if>
- <if test="orderNum != null and orderNum != ''">#{orderNum},</if>
- <if test="leader != null and leader != ''">#{leader},</if>
- <if test="phone != null and phone != ''">#{phone},</if>
- <if test="email != null and email != ''">#{email},</if>
- <if test="status != null">#{status},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
- sysdate()
- )
- </insert>
-
- <update id="updateDept" parameterType="SysDept">
- update sys_dept
- <set>
- <if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
- <if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
- <if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
- <if test="orderNum != null and orderNum != ''">order_num = #{orderNum},</if>
- <if test="leader != null">leader = #{leader},</if>
- <if test="phone != null">phone = #{phone},</if>
- <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>
- update_time = sysdate()
- </set>
- where dept_id = #{deptId}
- </update>
<update id="updateDeptChildren" parameterType="java.util.List">
update sys_dept set ancestors =
@@ -163,20 +70,4 @@
</foreach>
</update>
- <update id="updateDeptStatus" parameterType="SysDept">
- update sys_dept
- <set>
- <if test="status != null and status != ''">status = #{status},</if>
- <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- update_time = sysdate()
- </set>
- where dept_id in (${ancestors})
- </update>
-
- <delete id="deleteDeptById" parameterType="Long">
- update sys_dept
- set del_flag = '2'
- where dept_id = #{deptId}
- </delete>
-
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3