1.权限优化

tnc-system/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java

@@ -507,22 +507,45 @@ public class SysPermissionController {
 			// 根据角色ID 查找角色
 			SysRole byId = iSysRoleService.getById(roleId);
 			String join ="";
+			String sysPermission1 = sysPermissionService.queryListByPermissionName(powerCreateBy).get(0).getId();
+			String sysPermission2 = sysPermissionService.queryListByPermissionName(powerOrg).get(0).getId();
+			String sysPermission3 = sysPermissionService.queryListByPermissionName(powerThisOrg).get(0).getId();
+			sysPermissionService.queryListByPermissionName(powerCreateBy);
 			if (StringUtils.isNotBlank(byId.getPower())&&byId.getPower().equals("1")){
-				List<SysPermission> sysPermissions = sysPermissionService.queryListByPermissionName(powerCreateBy);
-				join = sysPermissions.get(0).getId();
+				join = sysPermission1;
 			}
 			if (StringUtils.isNotBlank(byId.getPower())&&byId.getPower().equals("2")){
-				List<SysPermission> sysPermissions = sysPermissionService.queryListByPermissionName(powerOrg);
-				join =  sysPermissions.get(0).getId();
+				join =  sysPermission2;
 			}
 			if (StringUtils.isNotBlank(byId.getPower())&&byId.getPower().equals("3")){
-				List<SysPermission> sysPermissions = sysPermissionService.queryListByPermissionName(powerThisOrg);
-				join =  sysPermissions.get(0).getId();
+				join = sysPermission3;
 			}
 			if (StringUtils.isNotBlank(join)){
-				UpdateWrapper<SysRolePermission> updateWrapper = new UpdateWrapper<>();
-				updateWrapper.eq("role_id",roleId).set("data_rule_ids",join);
-				sysRolePermissionService.update(updateWrapper);
+				//查出原有的
+				LambdaQueryWrapper<SysRolePermission> query = new LambdaQueryWrapper<SysRolePermission>();
+				query.eq(SysRolePermission::getRoleId, byId.getId());
+				List<SysRolePermission> list = sysRolePermissionService.list(query);
+				for (SysRolePermission sysRolePermission : list) {
+					if (StringUtils.isNotBlank(sysRolePermission.getDataRuleIds())){
+						String replace = sysRolePermission.getDataRuleIds()
+								.replace(sysPermission1, join)
+								.replace(sysPermission2, join)
+								.replace(sysPermission2, join);
+						UpdateWrapper<SysRolePermission> updateWrapper = new UpdateWrapper<>();
+						updateWrapper
+								.eq("role_id",byId.getId())
+								.eq("permission_id",sysRolePermission.getPermissionId())
+								.set("data_rule_ids",replace);
+						sysRolePermissionService.update(updateWrapper);
+					}else {
+						UpdateWrapper<SysRolePermission> updateWrapper = new UpdateWrapper<>();
+						updateWrapper
+								.eq("role_id",byId.getId())
+								.eq("permission_id",sysRolePermission.getPermissionId())
+								.set("data_rule_ids",join);
+						sysRolePermissionService.update(updateWrapper);
+					}
+				}
 			}
 
 			//update-begin---author:wangshuai ---date:20220316  for：[VUEN-234]用户管理角色授权添加敏感日志------------