ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【添加】处理 sonar提示的bug

Browse Source
This commit is contained in:
zer0Black
2023-10-05 13:03:41 +08:00
parent 1429117716
commit bb626262ba
2 changed files with 93 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules-docking/src/main/java/com/jero/modules/docking/iam/controller/SyncIamController.java
+5 -4
View File
@@ -1,5 +1,6 @@
package com.jero.modules.docking.iam.controller;
import cn.hutool.core.text.CharSequenceUtil;
import cn.hutool.core.util.StrUtil;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
@@ -272,19 +273,19 @@ public class SyncIamController {
public BpmcResponseDto bpmcCreate(@RequestBody BpmcAcceptDto bpmcAcceptDto) throws JsonProcessingException {
log.info("统一权限服务平台请求数据:{}", bpmcAcceptDto.toString());
if (StrUtil.isEmpty(bpmcAcceptDto.getType())){
if (CharSequenceUtil.isEmpty(bpmcAcceptDto.getType())){
return BpmcResponseDto.error("接口类型（type）未传参，请检查");
}
if (StrUtil.isEmpty(bpmcAcceptDto.getEntity())){
if (CharSequenceUtil.isEmpty(bpmcAcceptDto.getEntity())){
return BpmcResponseDto.error("数据实体（entity）未传参，请检查");
}
if (StrUtil.isEmpty(bpmcAcceptDto.getAction())){
if (CharSequenceUtil.isEmpty(bpmcAcceptDto.getAction())){
return BpmcResponseDto.error("操作方式（action）未传参，请检查");
}
if (StrUtil.isEmpty(bpmcAcceptDto.getSignature())){
if (CharSequenceUtil.isEmpty(bpmcAcceptDto.getSignature())){
return BpmcResponseDto.error("签名（signature）未传参，请检查");
}
laws-modules-docking/src/main/java/com/jero/modules/docking/iam/service/SyncIamService.java
+88 -75
View File
@@ -1,6 +1,7 @@
package com.jero.modules.docking.iam.service;
import cn.hutool.core.lang.Validator;
import cn.hutool.core.text.CharSequenceUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.StrUtil;
import com.bamboocloud.codec.BamboocloudFacade;
@@ -78,8 +79,7 @@ public class SyncIamService {
@Resource
private ISysRolePermissionService sysRolePermissionService;
@Resource
private DuplicateCheckController duplicateCheckController;
private String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
/**
* 校验IAM调用时的账号密码是否正确
@@ -127,10 +127,8 @@ public class SyncIamService {
if (field.isAnnotationPresent(IamProperty.class)) {
SchemaResponseInner schemaInfo = new SchemaResponseInner();
field.setAccessible(true);
//获取Annotation对象
IamProperty iamProperty = (IamProperty) field.getAnnotation(IamProperty.class);
IamProperty iamProperty = field.getAnnotation(IamProperty.class);
//提取注解对象元数据
boolean required = iamProperty.required();
boolean multivalued = iamProperty.multivalued();
@@ -189,13 +187,13 @@ public class SyncIamService {
sysUser.setTelephone(userAcceptDto.getSrmsOfficePhone());
sysUser.setCreateBy(DockingConstant.IAM_SYSTEM_NAME);
sysUser.setUpdateBy(DockingConstant.IAM_SYSTEM_NAME);
if (StrUtil.isNotEmpty(userAcceptDto.getSrmsCreateTime())){
Date createTime = DateUtils.str2Date(userAcceptDto.getSrmsCreateTime(), new SimpleDateFormat("YYYY-MM-dd HH:mm:ss"));
if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsCreateTime())){
Date createTime = DateUtils.str2Date(userAcceptDto.getSrmsCreateTime(), new SimpleDateFormat(DATE_FORMAT));
sysUser.setCreateTime(createTime);
}
if (StrUtil.isNotEmpty(userAcceptDto.getSrmsUpdateTime())){
Date updateTime = DateUtils.str2Date(userAcceptDto.getSrmsUpdateTime(), new SimpleDateFormat("YYYY-MM-dd HH:mm:ss"));
if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsUpdateTime())){
Date updateTime = DateUtils.str2Date(userAcceptDto.getSrmsUpdateTime(), new SimpleDateFormat(DATE_FORMAT));
sysUser.setCreateTime(updateTime);
}
@@ -244,7 +242,7 @@ public class SyncIamService {
public IamCommonResponseDto userUpdateService(IamUserAcceptDto userAcceptDto){
log.info("用户更新收到的解密后数据:{}", userAcceptDto.toString());
if (userAcceptDto == null || StrUtil.isEmpty(userAcceptDto.getBimUid())){
if (userAcceptDto == null || CharSequenceUtil.isEmpty(userAcceptDto.getBimUid())){
throw new IamGlobalException(userAcceptDto.getBimRequestId(), "用户id（bimUid）为空，无法进行用户信息更新");
}
@@ -254,15 +252,15 @@ public class SyncIamService {
throw new IamGlobalException(userAcceptDto.getBimRequestId(), "未查询到id为（" + userAcceptDto.getBimUid() + "）用户，无法更新");
}
if (StrUtil.isNotEmpty(userAcceptDto.getSrmsUsername())){
if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsUsername())){
sysUser.setUsername(userAcceptDto.getSrmsUsername());
}
if (StrUtil.isNotEmpty(userAcceptDto.getSrmsRealname())){
if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsRealname())){
sysUser.setRealname(userAcceptDto.getSrmsRealname());
}
if (StrUtil.isNotEmpty(userAcceptDto.getSrmsSex()) && NumberUtil.isInteger(userAcceptDto.getSrmsSex())){
if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsSex()) && NumberUtil.isInteger(userAcceptDto.getSrmsSex())){
sysUser.setSex(Integer.valueOf(userAcceptDto.getSrmsSex()));
}
@@ -271,7 +269,7 @@ public class SyncIamService {
sysUser.setEmail(userAcceptDto.getSrmsEmail());
sysUser.setPhone(userAcceptDto.getSrmsPhone());
if (StrUtil.isNotEmpty(userAcceptDto.getSrmsStatus())){
if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsStatus())){
if ("1".equals(userAcceptDto.getSrmsStatus())){
sysUser.setStatus(CommonConstant.USER_UNFREEZE);
sysUser.setDelFlag(CommonConstant.DEL_FLAG_0);
@@ -281,90 +279,90 @@ public class SyncIamService {
}
}
if (StrUtil.isNotEmpty(userAcceptDto.getSrmsOfficePhone())){
if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsOfficePhone())){
sysUser.setTelephone(userAcceptDto.getSrmsOfficePhone());
}
sysUser.setUpdateBy(DockingConstant.IAM_SYSTEM_NAME);
if (StrUtil.isNotEmpty(userAcceptDto.getSrmsUpdateTime())){
Date updateTime = DateUtils.str2Date(userAcceptDto.getSrmsUpdateTime(), new SimpleDateFormat("YYYY-MM-dd HH:mm:ss"));
if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsUpdateTime())){
Date updateTime = DateUtils.str2Date(userAcceptDto.getSrmsUpdateTime(), new SimpleDateFormat(DATE_FORMAT));
sysUser.setCreateTime(updateTime);
}
if (StrUtil.isNotEmpty(userAcceptDto.getSrmsTypeId())){
if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsTypeId())){
sysUser.setTypeId(userAcceptDto.getSrmsTypeId());
}
if (StrUtil.isNotEmpty(userAcceptDto.getSrmsPost())){
if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsPost())){
sysUser.setPost(userAcceptDto.getSrmsPost());
}
if (StrUtil.isNotEmpty(userAcceptDto.getSrmsDutyLevelId())){
if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsDutyLevelId())){
sysUser.setDutyLevelId(userAcceptDto.getSrmsDutyLevelId());
}
if (StrUtil.isNotEmpty(userAcceptDto.getSrmsRace())){
if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsRace())){
sysUser.setRace(userAcceptDto.getSrmsRace());
}
if (StrUtil.isNotEmpty(userAcceptDto.getSrmsPostSequence())){
if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsPostSequence())){
sysUser.setPostSequence(userAcceptDto.getSrmsPostSequence());
}
if (StrUtil.isNotEmpty(userAcceptDto.getSrmsTechnicalPosition())){
if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsTechnicalPosition())){
sysUser.setTechnicalPosition(userAcceptDto.getSrmsTechnicalPosition());
}
if (StrUtil.isNotEmpty(userAcceptDto.getSrmsDirectLeadership())){
if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsDirectLeadership())){
sysUser.setDirectLeadership(userAcceptDto.getSrmsDirectLeadership());
}
if (StrUtil.isNotEmpty(userAcceptDto.getSrmsPostStatus())){
if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsPostStatus())){
sysUser.setPostStatus(userAcceptDto.getSrmsPostStatus());
}
if (StrUtil.isNotEmpty(userAcceptDto.getSrmsIdNumber())){
if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsIdNumber())){
sysUser.setIdNumber(userAcceptDto.getSrmsIdNumber());
}
if (StrUtil.isNotEmpty(userAcceptDto.getSrmsEducation())){
if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsEducation())){
sysUser.setEducation(userAcceptDto.getSrmsEducation());
}
if (StrUtil.isNotEmpty(userAcceptDto.getSrmsDepartmentBeforeTransfer())){
if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsDepartmentBeforeTransfer())){
sysUser.setDepartmentBeforeTransfer(userAcceptDto.getSrmsDepartmentBeforeTransfer());
}
if (StrUtil.isNotEmpty(userAcceptDto.getSrmsLaborDispatchCode())){
if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsLaborDispatchCode())){
sysUser.setLaborDispatchCode(userAcceptDto.getSrmsLaborDispatchCode());
}
if (StrUtil.isNotEmpty(userAcceptDto.getSrmsLaborDispatchName())){
if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsLaborDispatchName())){
sysUser.setLaborDispatchName(userAcceptDto.getSrmsLaborDispatchName());
}
if (StrUtil.isNotEmpty(userAcceptDto.getSrmsProfessionalQualification())){
if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsProfessionalQualification())){
sysUser.setProfessionalQualification(userAcceptDto.getSrmsProfessionalQualification());
}
if (StrUtil.isNotEmpty(userAcceptDto.getSrmsProfessionalLevel())){
if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsProfessionalLevel())){
sysUser.setProfessionalLevel(userAcceptDto.getSrmsProfessionalLevel());
}
if (StrUtil.isNotEmpty(userAcceptDto.getSrmsEntryTime())){
if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsEntryTime())){
sysUser.setEntryTime(userAcceptDto.getSrmsEntryTime());
}
@@ -373,7 +371,7 @@ public class SyncIamService {
String orgCode = userAcceptDto.getSrmsOrgCode();
String selectedDeparts = null;
if (StrUtil.isNotEmpty(orgCode)){
if (CharSequenceUtil.isNotEmpty(orgCode)){
selectedDeparts = orgCode;
}
@@ -394,12 +392,17 @@ public class SyncIamService {
* @return
*/
public IamCommonResponseDto userDeleteService(IamUserAcceptDto userAcceptDto){
log.info("用户删除收到的解密后数据:{}", userAcceptDto.toString());
if (userAcceptDto == null || CharSequenceUtil.isEmpty(userAcceptDto.getBimUid())){
String bimRequestId = null;
if (userAcceptDto != null) {
bimRequestId = userAcceptDto.getBimRequestId();
}
if (userAcceptDto == null || StrUtil.isEmpty(userAcceptDto.getBimUid())){
throw new IamGlobalException(userAcceptDto.getBimRequestId(), "用户id（bimUid）为空，无法进行用户删除");
throw new IamGlobalException(bimRequestId, "用户id（bimUid）为空，无法进行用户删除");
}
log.info("用户删除收到的解密后数据:{}", userAcceptDto.toString());
this.sysUserService.deleteUser(userAcceptDto.getBimUid());
IamCommonResponseDto iamCommonResponseDto = new IamCommonResponseDto();
@@ -416,12 +419,17 @@ public class SyncIamService {
* @return
*/
public IamOrgCreateResponse orgCreateService(IamOrgAcceptDto orgAcceptDto){
log.info("组织创建收到的解密后数据:{}", orgAcceptDto.toString());
if (orgAcceptDto == null || CharSequenceUtil.isEmpty(orgAcceptDto.getSrmsOrgCode())){
String bimRequestId = null;
if (orgAcceptDto != null) {
bimRequestId = orgAcceptDto.getBimRequestId();
}
if (orgAcceptDto == null || StrUtil.isEmpty(orgAcceptDto.getSrmsOrgCode())){
throw new IamGlobalException(orgAcceptDto.getBimRequestId(), "机构编码为空，无法进行数据存储");
throw new IamGlobalException(bimRequestId, "机构编码为空，无法进行数据存储");
}
log.info("组织创建收到的解密后数据:{}", orgAcceptDto.toString());
IamOrgCreateResponse iamOrgCreateResponse = new IamOrgCreateResponse();
iamOrgCreateResponse.setBimRequestId(orgAcceptDto.getBimRequestId());
iamOrgCreateResponse.setResultCode(DockingConstant.IAM_SUCCESS_RESULT_CODE);
@@ -453,14 +461,14 @@ public class SyncIamService {
}
sysDepart.setCreateBy(DockingConstant.IAM_SYSTEM_NAME);
if (StrUtil.isNotEmpty(orgAcceptDto.getSrmsCreateTime())){
Date createTime = DateUtils.str2Date(orgAcceptDto.getSrmsCreateTime(), new SimpleDateFormat("YYYY-MM-dd HH:mm:ss"));
if (CharSequenceUtil.isNotEmpty(orgAcceptDto.getSrmsCreateTime())){
Date createTime = DateUtils.str2Date(orgAcceptDto.getSrmsCreateTime(), new SimpleDateFormat(DATE_FORMAT));
sysDepart.setCreateTime(createTime);
}
sysDepart.setUpdateBy(DockingConstant.IAM_SYSTEM_NAME);
if (StrUtil.isNotEmpty(orgAcceptDto.getSrmsUpdateTime())){
Date updateTime = DateUtils.str2Date(orgAcceptDto.getSrmsUpdateTime(), new SimpleDateFormat("YYYY-MM-dd HH:mm:ss"));
if (CharSequenceUtil.isNotEmpty(orgAcceptDto.getSrmsUpdateTime())){
Date updateTime = DateUtils.str2Date(orgAcceptDto.getSrmsUpdateTime(), new SimpleDateFormat(DATE_FORMAT));
sysDepart.setCreateTime(updateTime);
}
@@ -485,7 +493,7 @@ public class SyncIamService {
public IamCommonResponseDto orgUpdateService(IamOrgAcceptDto orgAcceptDto){
log.info("组织更新收到的解密后数据:{}", orgAcceptDto.toString());
if (orgAcceptDto == null || StrUtil.isEmpty(orgAcceptDto.getBimOrgId())){
if (orgAcceptDto == null || CharSequenceUtil.isEmpty(orgAcceptDto.getBimOrgId())){
throw new IamGlobalException(orgAcceptDto.getBimRequestId(), "机构id为空，无法进行组织信息更新");
}
@@ -500,15 +508,15 @@ public class SyncIamService {
throw new IamGlobalException(orgAcceptDto.getBimRequestId(), "未查询到id为（" + orgAcceptDto.getBimOrgId() + "）组织，无法更新");
}
if (StrUtil.isNotEmpty(orgAcceptDto.getSrmsParentCode())){
if (CharSequenceUtil.isNotEmpty(orgAcceptDto.getSrmsParentCode())){
sysDepart.setParentId(orgAcceptDto.getSrmsParentCode());
}
if (StrUtil.isNotEmpty(orgAcceptDto.getSrmsDepartName())){
if (CharSequenceUtil.isNotEmpty(orgAcceptDto.getSrmsDepartName())){
sysDepart.setDepartName(orgAcceptDto.getSrmsDepartName());
}
if (StrUtil.isNotEmpty(orgAcceptDto.getSrmsOrgCategory())){
if (CharSequenceUtil.isNotEmpty(orgAcceptDto.getSrmsOrgCategory())){
// 1为单位，2为部门，转映射到 本系统内的数据 1公司，2组织机构，映射关系一致。如下代码是为了后续修改方便
if ("1".equals(orgAcceptDto.getSrmsOrgCategory())){
sysDepart.setOrgCategory("1");
@@ -517,15 +525,15 @@ public class SyncIamService {
}
}
if (StrUtil.isNotEmpty(orgAcceptDto.getSrmsType())){
if (CharSequenceUtil.isNotEmpty(orgAcceptDto.getSrmsType())){
sysDepart.setOrgType(orgAcceptDto.getSrmsType());
}
if (StrUtil.isNotEmpty(orgAcceptDto.getSrmsOrgCode())){
if (CharSequenceUtil.isNotEmpty(orgAcceptDto.getSrmsOrgCode())){
sysDepart.setOrgCode(orgAcceptDto.getSrmsOrgCode());
}
if (StrUtil.isNotEmpty(orgAcceptDto.getSrmsStatus())){
if (CharSequenceUtil.isNotEmpty(orgAcceptDto.getSrmsStatus())){
if ("1".equals(orgAcceptDto.getSrmsStatus())){
sysDepart.setStatus(CommonConstant.STATUS_1);
sysDepart.setDelFlag(String.valueOf(CommonConstant.DEL_FLAG_0));
@@ -536,24 +544,24 @@ public class SyncIamService {
}
sysDepart.setUpdateBy(DockingConstant.IAM_SYSTEM_NAME);
if (StrUtil.isNotEmpty(orgAcceptDto.getSrmsUpdateTime())){
Date updateTime = DateUtils.str2Date(orgAcceptDto.getSrmsUpdateTime(), new SimpleDateFormat("YYYY-MM-dd HH:mm:ss"));
if (CharSequenceUtil.isNotEmpty(orgAcceptDto.getSrmsUpdateTime())){
Date updateTime = DateUtils.str2Date(orgAcceptDto.getSrmsUpdateTime(), new SimpleDateFormat(DATE_FORMAT));
sysDepart.setCreateTime(updateTime);
}
if (StrUtil.isNotEmpty(orgAcceptDto.getSrmsCompany())){
if (CharSequenceUtil.isNotEmpty(orgAcceptDto.getSrmsCompany())){
sysDepart.setCompany(orgAcceptDto.getSrmsCompany());
}
if (StrUtil.isNotEmpty(orgAcceptDto.getSrmsHeadOfDepartment())){
if (CharSequenceUtil.isNotEmpty(orgAcceptDto.getSrmsHeadOfDepartment())){
sysDepart.setHeadOfDepartment(orgAcceptDto.getSrmsHeadOfDepartment());
}
if (StrUtil.isNotEmpty(orgAcceptDto.getSrmsLeadersInCharge())){
if (CharSequenceUtil.isNotEmpty(orgAcceptDto.getSrmsLeadersInCharge())){
sysDepart.setLeadersInCharge(orgAcceptDto.getSrmsLeadersInCharge());
}
if (StrUtil.isNotEmpty(orgAcceptDto.getSrmsDeputyLeader())){
if (CharSequenceUtil.isNotEmpty(orgAcceptDto.getSrmsDeputyLeader())){
sysDepart.setDeputyLeader(orgAcceptDto.getSrmsDeputyLeader());
}
@@ -569,12 +577,17 @@ public class SyncIamService {
* @return
*/
public IamCommonResponseDto orgDeleteService(IamOrgAcceptDto orgAcceptDto){
log.info("组织删除收到的解密后数据:{}", orgAcceptDto.toString());
if (orgAcceptDto == null || CharSequenceUtil.isEmpty(orgAcceptDto.getBimOrgId())){
String bimRequestId = null;
if (orgAcceptDto != null) {
bimRequestId = orgAcceptDto.getBimRequestId();
}
if (orgAcceptDto == null || StrUtil.isEmpty(orgAcceptDto.getBimOrgId())){
throw new IamGlobalException(orgAcceptDto.getBimRequestId(), "用户id（bimUid）为空，无法进行组织删除");
throw new IamGlobalException(bimRequestId, "用户id（bimUid）为空，无法进行组织删除");
}
log.info("组织删除收到的解密后数据:{}", orgAcceptDto.toString());
this.sysDepartService.delete(orgAcceptDto.getBimOrgId());
IamCommonResponseDto iamCommonResponseDto = new IamCommonResponseDto();
@@ -646,7 +659,7 @@ public class SyncIamService {
*/
public BpmcResponseDto roleUpdateService(RoleDto roleDto){
try {
if (StrUtil.isEmpty(roleDto.getId())){
if (CharSequenceUtil.isEmpty(roleDto.getId())){
return BpmcResponseDto.error("角色id为空，无法更新");
}
@@ -656,15 +669,15 @@ public class SyncIamService {
return BpmcResponseDto.error("未找到对应id角色，无法更新");
}
if (StrUtil.isNotEmpty(roleDto.getName())){
if (CharSequenceUtil.isNotEmpty(roleDto.getName())){
sysRole.setRoleName(roleDto.getName());
}
if (StrUtil.isNotEmpty(roleDto.getCode())){
if (CharSequenceUtil.isNotEmpty(roleDto.getCode())){
sysRole.setRoleCode(roleDto.getCode());
}
if (StrUtil.isNotEmpty(roleDto.getDescription())){
if (CharSequenceUtil.isNotEmpty(roleDto.getDescription())){
sysRole.setDescription(roleDto.getDescription());
}
@@ -688,7 +701,7 @@ public class SyncIamService {
*/
public BpmcResponseDto roleDeleteService(RoleDto roleDto){
try {
if (StrUtil.isEmpty(roleDto.getId())){
if (CharSequenceUtil.isEmpty(roleDto.getId())){
return BpmcResponseDto.error("角色id为空，无法删除");
}
@@ -719,7 +732,7 @@ public class SyncIamService {
// sysPermission的 menuType （0：一级菜单；1：子菜单 ；2：按钮权限）
if (DockingConstant.BPMC_RESOURCE_TYPE_MENU == resourceDto.getType()){
if (StrUtil.isEmpty(resourceDto.getParentId())){
if (CharSequenceUtil.isEmpty(resourceDto.getParentId())){
sysPermission.setMenuType(0);
} else {
sysPermission.setMenuType(1);
@@ -758,7 +771,7 @@ public class SyncIamService {
*/
public BpmcResponseDto resourceUpdateService(ResourceDto resourceDto){
try {
if (StrUtil.isEmpty(resourceDto.getId())){
if (CharSequenceUtil.isEmpty(resourceDto.getId())){
return BpmcResponseDto.error("菜单id为空，无法更新");
}
@@ -768,20 +781,20 @@ public class SyncIamService {
return BpmcResponseDto.error("未找到对应id功能权限，无法更新");
}
if (StrUtil.isNotEmpty(resourceDto.getParentId())){
if (CharSequenceUtil.isNotEmpty(resourceDto.getParentId())){
sysPermission.setParentId(resourceDto.getParentId());
}
if (StrUtil.isNotEmpty(resourceDto.getName())){
if (CharSequenceUtil.isNotEmpty(resourceDto.getName())){
sysPermission.setName(resourceDto.getName());
}
if (StrUtil.isNotEmpty(resourceDto.getCode())){
if (CharSequenceUtil.isNotEmpty(resourceDto.getCode())){
sysPermission.setPerms(resourceDto.getCode());
sysPermission.setComponent(resourceDto.getCode()); // 组件的路径
}
if (StrUtil.isNotEmpty(resourceDto.getUrl())){
if (CharSequenceUtil.isNotEmpty(resourceDto.getUrl())){
sysPermission.setUrl(resourceDto.getUrl()); // 地址栏显示的路径
}
@@ -789,7 +802,7 @@ public class SyncIamService {
// sysPermission的 menuType （0：一级菜单；1：子菜单 ；2：按钮权限）
if (DockingConstant.BPMC_RESOURCE_TYPE_MENU == resourceDto.getType()){
if (StrUtil.isEmpty(resourceDto.getParentId())){
if (CharSequenceUtil.isEmpty(resourceDto.getParentId())){
sysPermission.setMenuType(0);
} else {
sysPermission.setMenuType(1);
@@ -816,7 +829,7 @@ public class SyncIamService {
*/
public BpmcResponseDto resourceDeleteService(ResourceDto resourceDto){
try {
if (StrUtil.isEmpty(resourceDto.getId())){
if (CharSequenceUtil.isEmpty(resourceDto.getId())){
return BpmcResponseDto.error("菜单id为空，无法删除");
}
@@ -858,7 +871,7 @@ public class SyncIamService {
public BpmcResponseDto userRoleDeleteService(List<UserRoleDto> userRoleDtoList){
try {
for (UserRoleDto userRoleDto : userRoleDtoList){
QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper();
QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<SysUserRole>();
queryWrapper.eq("user_id", userRoleDto.getUserId());
queryWrapper.eq("role_id", userRoleDto.getArId());
@@ -901,7 +914,7 @@ public class SyncIamService {
public BpmcResponseDto roleResourceDeleteService(List<RoleResourceDto> roleResourceDtoList){
try {
for (RoleResourceDto roleResourceDto : roleResourceDtoList){
QueryWrapper<SysRolePermission> queryWrapper = new QueryWrapper();
QueryWrapper<SysRolePermission> queryWrapper = new QueryWrapper<SysRolePermission>();
queryWrapper.eq("permission_id", roleResourceDto.getAmId());
queryWrapper.eq("role_id", roleResourceDto.getArId());