|
@@ -104,21 +104,21 @@ public class PermissionHandler implements ApplicationListener<ApplicationReadyEv
|
|
|
// 需要删除的集合
|
|
|
List<SecurityPermissionBO> delPermissionBoList = new ArrayList<>();
|
|
|
permissionBoList.forEach(bo -> {
|
|
|
- boolean result = permissionVoList.stream().anyMatch(vo -> StrUtils.equals(vo.getCode().concat(vo.getName()), bo.getCode().concat(bo.getModuleName())));
|
|
|
+ boolean result = permissionVoList.stream().anyMatch(vo -> StrUtils.equals(vo.getCode().concat(vo.getModuleName()), bo.getCode().concat(bo.getModuleName())));
|
|
|
if (!result) {
|
|
|
addPermissionBoList.add(bo);
|
|
|
}
|
|
|
});
|
|
|
permissionVoList.forEach(vo -> {
|
|
|
- boolean result = permissionBoList.stream().noneMatch(bo -> StrUtils.equals(vo.getCode().concat(vo.getName()), bo.getCode().concat(bo.getModuleName())));
|
|
|
+ boolean result = permissionBoList.stream().noneMatch(bo -> StrUtils.equals(vo.getCode().concat(vo.getModuleName()), bo.getCode().concat(bo.getModuleName())));
|
|
|
if (result) {
|
|
|
SecurityPermissionBO delPermissionBo = BeanUtils.copyProperties(vo, SecurityPermissionBO.class);
|
|
|
delPermissionBoList.add(delPermissionBo);
|
|
|
}
|
|
|
|
|
|
});
|
|
|
- addPermissionBoList.forEach(bo -> log.info("新增权限编码:{}", bo.getCode().concat(bo.getModuleName())));
|
|
|
- delPermissionBoList.forEach(bo -> log.info("删除权限编码:{}", bo.getCode().concat(bo.getModuleName())));
|
|
|
+ addPermissionBoList.forEach(bo -> log.info("新增权限编码:{}", bo.getCode().concat(":" + bo.getModuleName())));
|
|
|
+ delPermissionBoList.forEach(bo -> log.info("删除权限编码:{}", bo.getCode().concat(":" + bo.getModuleName())));
|
|
|
// 新增
|
|
|
if (CollUtils.isNotEmpty(addPermissionBoList)) {
|
|
|
boolean isSuccess = securityPermissionService.addPermissionBatch(addPermissionBoList);
|