From c0d430f4e5adf08129c2610d9d2b5446bb19c0d6 Mon Sep 17 00:00:00 2001
From: XCSDN <gitee@xcsdn.net>
Date: Thu, 07 Apr 2022 12:57:56 +0800
Subject: [PATCH] update ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java. 字典类型必须以字母开头,且字典类型只能由小写字母或加下划线还有数字组成 防止由于字典类型不符合前端开发规范而报错
---
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
index 67ce434..44bd868 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -30,6 +30,9 @@
<select id="selectDeptList" parameterType="SysDept" resultMap="SysDeptResult">
<include refid="selectDeptVo"/>
where d.del_flag = '0'
+ <if test="deptId != null and deptId != 0">
+ AND dept_id = #{deptId}
+ </if>
<if test="parentId != null and parentId != 0">
AND parent_id = #{parentId}
</if>
@@ -44,7 +47,7 @@
order by d.parent_id, d.order_num
</select>
- <select id="selectDeptListByRoleId" resultType="Integer">
+ <select id="selectDeptListByRoleId" resultType="Long">
select d.dept_id
from sys_dept d
left join sys_role_dept rd on d.dept_id = rd.dept_id
--
Gitblit v1.9.2