From ce438f182a0d49de7f7f927dfd24e7e52a6527ee Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 30 十一月 2020 12:41:39 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
index ca8df48..7d6984d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
@@ -10,9 +10,11 @@
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.TreeSelect;
import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.mapper.SysDeptMapper;
+import com.ruoyi.system.mapper.SysRoleMapper;
import com.ruoyi.system.service.ISysDeptService;
/**
@@ -25,6 +27,9 @@
{
@Autowired
private SysDeptMapper deptMapper;
+
+ @Autowired
+ private SysRoleMapper roleMapper;
/**
* 鏌ヨ閮ㄩ棬绠＄悊鏁版嵁
@@ -93,7 +98,8 @@
@Override
public List<Integer> selectDeptListByRoleId(Long roleId)
{
- return deptMapper.selectDeptListByRoleId(roleId);
+ SysRole role = roleMapper.selectRoleById(roleId);
+ return deptMapper.selectDeptListByRoleId(roleId, role.isDeptCheckStrictly());
}
/**
@@ -267,13 +273,7 @@
{
if (hasChild(list, tChild))
{
- // 鍒ゆ柇鏄惁鏈夊瓙鑺傜偣
- Iterator<SysDept> it = childList.iterator();
- while (it.hasNext())
- {
- SysDept n = (SysDept) it.next();
- recursionFn(list, n);
- }
+ recursionFn(list, tChild);
}
}
}
--
Gitblit v1.9.3