diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartPermissionServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartPermissionServiceImpl.java index 5c312971..7184dcb5 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartPermissionServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartPermissionServiceImpl.java @@ -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 add = getDiff(lastPermissionIds,permissionIds); - if(add!=null && add.size()>0) { - List list = new ArrayList(); + if(add!=null && !add.isEmpty()) { + List 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 delete = getDiff(permissionIds,lastPermissionIds); - if(delete!=null && delete.size()>0) { + if(delete!=null && !delete.isEmpty()) { for (String permissionId : delete) { this.remove(new QueryWrapper().lambda().eq(SysDepartPermission::getDepartId, departId).eq(SysDepartPermission::getPermissionId, permissionId)); } @@ -55,11 +53,11 @@ public class SysDepartPermissionServiceImpl extends ServiceImpl getPermRuleListByDeptIdAndPermId(String departId, String permissionId) { SysDepartPermission departPermission = this.getOne(new QueryWrapper().lambda().eq(SysDepartPermission::getDepartId, departId).eq(SysDepartPermission::getPermissionId, permissionId)); if(departPermission != null){ - LambdaQueryWrapper query = new LambdaQueryWrapper(); + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.in(SysPermissionDataRule::getId, Arrays.asList(departPermission.getDataRuleIds().split(","))); query.orderByDesc(SysPermissionDataRule::getCreateTime); - List permRuleList = this.ruleMapper.selectList(query); - return permRuleList; +// List permRuleList = this.ruleMapper.selectList(query); + return this.ruleMapper.selectList(query); }else{ return null; } @@ -85,7 +83,7 @@ public class SysDepartPermissionServiceImpl extends ServiceImpl res = new ArrayList(); + List res = new ArrayList<>(); for (String key : diffArr) { if(oConvertUtils.isNotEmpty(key) && !map.containsKey(key)) { res.add(key);