From 0a9d4ea17b9f2bce9d82e959fbdb3c1c1f282ea2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 28 九月 2021 17:56:19 +0800
Subject: [PATCH] update 适配单体系与多体系用户权限
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java | 143 +++++++++++++++++++++++++++++------------------
1 files changed, 88 insertions(+), 55 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 467e501..cbafcf4 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
@@ -1,21 +1,28 @@
package com.ruoyi.system.service.impl;
-import cn.hutool.core.lang.Validator;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import cn.hutool.core.convert.Convert;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ruoyi.common.annotation.DataScope;
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.core.domain.entity.SysUser;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.system.mapper.SysDeptMapper;
import com.ruoyi.system.mapper.SysRoleMapper;
+import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.service.ISysDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -25,12 +32,13 @@
* @author ruoyi
*/
@Service
-public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> implements ISysDeptService {
- @Autowired
- private SysDeptMapper deptMapper;
+public class SysDeptServiceImpl extends ServicePlusImpl<SysDeptMapper, SysDept, SysDept> implements ISysDeptService {
@Autowired
private SysRoleMapper roleMapper;
+
+ @Autowired
+ private SysUserMapper userMapper;
/**
* 鏌ヨ閮ㄩ棬绠＄悊鏁版嵁
@@ -41,7 +49,7 @@
@Override
@DataScope(deptAlias = "d")
public List<SysDept> selectDeptList(SysDept dept) {
- return deptMapper.selectDeptList(dept);
+ return baseMapper.selectDeptList(dept);
}
/**
@@ -57,14 +65,13 @@
for (SysDept dept : depts) {
tempList.add(dept.getDeptId());
}
- for (Iterator<SysDept> iterator = depts.iterator(); iterator.hasNext(); ) {
- SysDept dept = (SysDept) iterator.next();
- // 濡傛灉鏄《绾ц妭鐐�, 閬嶅巻璇ョ埗鑺傜偣鐨勬墍鏈夊瓙鑺傜偣
- if (!tempList.contains(dept.getParentId())) {
- recursionFn(depts, dept);
- returnList.add(dept);
- }
- }
+ for (SysDept dept : depts) {
+ // 濡傛灉鏄《绾ц妭鐐�, 閬嶅巻璇ョ埗鑺傜偣鐨勬墍鏈夊瓙鑺傜偣
+ if (!tempList.contains(dept.getParentId())) {
+ recursionFn(depts, dept);
+ returnList.add(dept);
+ }
+ }
if (returnList.isEmpty()) {
returnList = depts;
}
@@ -91,8 +98,8 @@
*/
@Override
public List<Integer> selectDeptListByRoleId(Long roleId) {
- SysRole role = roleMapper.selectRoleById(roleId);
- return deptMapper.selectDeptListByRoleId(roleId, role.isDeptCheckStrictly());
+ SysRole role = roleMapper.selectById(roleId);
+ return baseMapper.selectDeptListByRoleId(roleId, role.isDeptCheckStrictly());
}
/**
@@ -103,7 +110,7 @@
*/
@Override
public SysDept selectDeptById(Long deptId) {
- return deptMapper.selectDeptById(deptId);
+ return getById(deptId);
}
/**
@@ -113,8 +120,10 @@
* @return 瀛愰儴闂ㄦ暟
*/
@Override
- public int selectNormalChildrenDeptById(Long deptId) {
- return deptMapper.selectNormalChildrenDeptById(deptId);
+ public long selectNormalChildrenDeptById(Long deptId) {
+ return count(new LambdaQueryWrapper<SysDept>()
+ .eq(SysDept::getStatus, 0)
+ .apply("find_in_set({0}, ancestors)", deptId));
}
/**
@@ -125,8 +134,10 @@
*/
@Override
public boolean hasChildByDeptId(Long deptId) {
- int result = deptMapper.hasChildByDeptId(deptId);
- return result > 0 ? true : false;
+ long result = count(new LambdaQueryWrapper<SysDept>()
+ .eq(SysDept::getParentId, deptId)
+ .last("limit 1"));
+ return result > 0;
}
/**
@@ -137,8 +148,9 @@
*/
@Override
public boolean checkDeptExistUser(Long deptId) {
- int result = deptMapper.checkDeptExistUser(deptId);
- return result > 0 ? true : false;
+ long result = userMapper.selectCount(new LambdaQueryWrapper<SysUser>()
+ .eq(SysUser::getDeptId, deptId));
+ return result > 0;
}
/**
@@ -149,12 +161,32 @@
*/
@Override
public String checkDeptNameUnique(SysDept dept) {
- Long deptId = Validator.isNull(dept.getDeptId()) ? -1L : dept.getDeptId();
- SysDept info = deptMapper.checkDeptNameUnique(dept.getDeptName(), dept.getParentId());
- if (Validator.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue()) {
+ Long deptId = StringUtils.isNull(dept.getDeptId()) ? -1L : dept.getDeptId();
+ SysDept info = getOne(new LambdaQueryWrapper<SysDept>()
+ .eq(SysDept::getDeptName, dept.getDeptName())
+ .eq(SysDept::getParentId, dept.getParentId())
+ .last("limit 1"));
+ if (StringUtils.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue()) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
+ }
+
+ /**
+ * 鏍￠獙閮ㄩ棬鏄惁鏈夋暟鎹潈闄�
+ *
+ * @param deptId 閮ㄩ棬id
+ */
+ @Override
+ public void checkDeptDataScope(Long deptId) {
+ if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
+ SysDept dept = new SysDept();
+ dept.setDeptId(deptId);
+ List<SysDept> depts = SpringUtils.getAopProxy(this).selectDeptList(dept);
+ if (StringUtils.isEmpty(depts)) {
+ throw new ServiceException("娌℃湁鏉冮檺璁块棶閮ㄩ棬鏁版嵁锛�");
+ }
+ }
}
/**
@@ -165,13 +197,13 @@
*/
@Override
public int insertDept(SysDept dept) {
- SysDept info = deptMapper.selectDeptById(dept.getParentId());
+ SysDept info = getById(dept.getParentId());
// 濡傛灉鐖惰妭鐐逛笉涓烘甯哥姸鎬�,鍒欎笉鍏佽鏂板瀛愯妭鐐�
if (!UserConstants.DEPT_NORMAL.equals(info.getStatus())) {
- throw new CustomException("閮ㄩ棬鍋滅敤锛屼笉鍏佽鏂板");
+ throw new ServiceException("閮ㄩ棬鍋滅敤锛屼笉鍏佽鏂板");
}
dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
- return deptMapper.insertDept(dept);
+ return baseMapper.insert(dept);
}
/**
@@ -182,18 +214,19 @@
*/
@Override
public int updateDept(SysDept dept) {
- SysDept newParentDept = deptMapper.selectDeptById(dept.getParentId());
- SysDept oldDept = deptMapper.selectDeptById(dept.getDeptId());
- if (Validator.isNotNull(newParentDept) && Validator.isNotNull(oldDept)) {
+ SysDept newParentDept = getById(dept.getParentId());
+ SysDept oldDept = getById(dept.getDeptId());
+ if (StringUtils.isNotNull(newParentDept) && StringUtils.isNotNull(oldDept)) {
String newAncestors = newParentDept.getAncestors() + "," + newParentDept.getDeptId();
String oldAncestors = oldDept.getAncestors();
dept.setAncestors(newAncestors);
updateDeptChildren(dept.getDeptId(), newAncestors, oldAncestors);
}
- int result = deptMapper.updateDept(dept);
- if (UserConstants.DEPT_NORMAL.equals(dept.getStatus())) {
+ int result = baseMapper.updateById(dept);
+ if (UserConstants.DEPT_NORMAL.equals(dept.getStatus()) && StringUtils.isNotEmpty(dept.getAncestors())
+ && !StringUtils.equals("0", dept.getAncestors())) {
// 濡傛灉璇ラ儴闂ㄦ槸鍚敤鐘舵�侊紝鍒欏惎鐢ㄨ閮ㄩ棬鐨勬墍鏈変笂绾ч儴闂�
- updateParentDeptStatus(dept);
+ updateParentDeptStatusNormal(dept);
}
return result;
}
@@ -203,27 +236,29 @@
*
* @param dept 褰撳墠閮ㄩ棬
*/
- private void updateParentDeptStatus(SysDept dept) {
- String updateBy = dept.getUpdateBy();
- dept = deptMapper.selectDeptById(dept.getDeptId());
- dept.setUpdateBy(updateBy);
- deptMapper.updateDeptStatus(dept);
+ private void updateParentDeptStatusNormal(SysDept dept) {
+ String ancestors = dept.getAncestors();
+ Long[] deptIds = Convert.toLongArray(ancestors);
+ update(null, new LambdaUpdateWrapper<SysDept>()
+ .set(SysDept::getStatus, "0")
+ .in(SysDept::getDeptId, Arrays.asList(deptIds)));
}
/**
* 淇敼瀛愬厓绱犲叧绯�
*
- * @param deptId 琚慨鏀圭殑閮ㄩ棬ID
+ * @param deptId 琚慨鏀圭殑閮ㄩ棬ID
* @param newAncestors 鏂扮殑鐖禝D闆嗗悎
* @param oldAncestors 鏃х殑鐖禝D闆嗗悎
*/
public void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors) {
- List<SysDept> children = deptMapper.selectChildrenDeptById(deptId);
+ List<SysDept> children = list(new LambdaQueryWrapper<SysDept>()
+ .apply("find_in_set({0},ancestors)",deptId));
for (SysDept child : children) {
- child.setAncestors(child.getAncestors().replace(oldAncestors, newAncestors));
+ child.setAncestors(child.getAncestors().replaceFirst(oldAncestors, newAncestors));
}
if (children.size() > 0) {
- deptMapper.updateDeptChildren(children);
+ baseMapper.updateDeptChildren(children);
}
}
@@ -235,7 +270,7 @@
*/
@Override
public int deleteDeptById(Long deptId) {
- return deptMapper.deleteDeptById(deptId);
+ return baseMapper.deleteById(deptId);
}
/**
@@ -257,13 +292,11 @@
*/
private List<SysDept> getChildList(List<SysDept> list, SysDept t) {
List<SysDept> tlist = new ArrayList<SysDept>();
- Iterator<SysDept> it = list.iterator();
- while (it.hasNext()) {
- SysDept n = (SysDept) it.next();
- if (Validator.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue()) {
- tlist.add(n);
- }
- }
+ for (SysDept n : list) {
+ if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue()) {
+ tlist.add(n);
+ }
+ }
return tlist;
}
@@ -271,6 +304,6 @@
* 鍒ゆ柇鏄惁鏈夊瓙鑺傜偣
*/
private boolean hasChild(List<SysDept> list, SysDept t) {
- return getChildList(list, t).size() > 0 ? true : false;
+ return getChildList(list, t).size() > 0;
}
}
--
Gitblit v1.9.3