KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【fix sonar】 SysDepartPermissionServiceImpl.java文件

Browse Source
This commit is contained in:
tianwenbo
2023-03-07 10:01:36 +08:00
parent 5db78626d7
commit 4cd33fd61a
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartPermissionServiceImpl.java
+8 -10
View File
@@ -2,6 +2,7 @@ package com.jero.modules.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.util.oConvertUtils;
import com.jero.modules.system.entity.SysDepartPermission;
import com.jero.modules.system.entity.SysPermissionDataRule;
@@ -9,13 +10,10 @@ import com.jero.modules.system.mapper.SysDepartPermissionMapper;
import com.jero.modules.system.mapper.SysPermissionDataRuleMapper;
import com.jero.modules.system.service.ISysDepartPermissionService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
/**
* @Description: 部门权限表
@@ -33,8 +31,8 @@ public class SysDepartPermissionServiceImpl extends ServiceImpl<SysDepartPermiss
@Transactional(rollbackFor = Exception.class)
public void saveDepartPermission(String departId, String permissionIds, String lastPermissionIds) {
List<String> add = getDiff(lastPermissionIds,permissionIds);
if(add!=null && add.size()>0) {
List<SysDepartPermission> list = new ArrayList<SysDepartPermission>();
if(add!=null && !add.isEmpty()) {
List<SysDepartPermission> list = new ArrayList<>();
for (String p : add) {
if(oConvertUtils.isNotEmpty(p)) {
SysDepartPermission rolepms = new SysDepartPermission(departId, p);
@@ -44,7 +42,7 @@ public class SysDepartPermissionServiceImpl extends ServiceImpl<SysDepartPermiss
this.saveBatch(list);
}
List<String> delete = getDiff(permissionIds,lastPermissionIds);
if(delete!=null && delete.size()>0) {
if(delete!=null && !delete.isEmpty()) {
for (String permissionId : delete) {
this.remove(new QueryWrapper<SysDepartPermission>().lambda().eq(SysDepartPermission::getDepartId, departId).eq(SysDepartPermission::getPermissionId, permissionId));
}
@@ -55,11 +53,11 @@ public class SysDepartPermissionServiceImpl extends ServiceImpl<SysDepartPermiss
public List<SysPermissionDataRule> getPermRuleListByDeptIdAndPermId(String departId, String permissionId) {
SysDepartPermission departPermission = this.getOne(new QueryWrapper<SysDepartPermission>().lambda().eq(SysDepartPermission::getDepartId, departId).eq(SysDepartPermission::getPermissionId, permissionId));
if(departPermission != null){
LambdaQueryWrapper<SysPermissionDataRule> query = new LambdaQueryWrapper<SysPermissionDataRule>();
LambdaQueryWrapper<SysPermissionDataRule> query = new LambdaQueryWrapper<>();
query.in(SysPermissionDataRule::getId, Arrays.asList(departPermission.getDataRuleIds().split(",")));
query.orderByDesc(SysPermissionDataRule::getCreateTime);
List<SysPermissionDataRule> permRuleList = this.ruleMapper.selectList(query);
return permRuleList;
// List<SysPermissionDataRule> permRuleList = this.ruleMapper.selectList(query);
return this.ruleMapper.selectList(query);
}else{
return null;
}
@@ -85,7 +83,7 @@ public class SysDepartPermissionServiceImpl extends ServiceImpl<SysDepartPermiss
for (String string : mainArr) {
map.put(string, 1);
}
List<String> res = new ArrayList<String>();
List<String> res = new ArrayList<>();
for (String key : diffArr) {
if(oConvertUtils.isNotEmpty(key) && !map.containsKey(key)) {
res.add(key);