From f6de03a009fc1f2d8755f33882b259f3c54d531a Mon Sep 17 00:00:00 2001
From: abbfun <819589789@qq.com>
Date: 星期五, 19 六月 2020 10:00:41 +0800
Subject: [PATCH] update ruoyi-ui/src/views/monitor/job/log.vue. data对象中属性【表单参数form】重复
---
ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml
index 247bb69..3338046 100644
--- a/ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml
@@ -40,7 +40,7 @@
AND status = #{status}
</if>
<!-- 数据范围过滤 -->
- ${dataScope}
+ ${params.dataScope}
order by d.parent_id, d.order_num
</select>
@@ -71,6 +71,10 @@
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}
--
Gitblit v1.9.2