修改角色权限

platform/src/main/java/com/jzg/controller/UserRoleController.java

@@ -68,7 +68,7 @@ public class UserRoleController extends BaseController {
             //从用户信息中获取租户code
             sysRoleVo.setSystemCode(getUserSystemCode());
             //租户校验 部门表单
-            if(Objects.isNull(sysRoleVo.getDeptId()) && sysRoleVo.getDeptId().isEmpty()){
+            if(Objects.isNull(sysRoleVo.getDeptId()) || sysRoleVo.getDeptId().isEmpty()){
                 throw new ValidateException("请选择部门");
             }
         }

platform/src/main/java/com/jzg/service/impl/UserRoleServiceImpl.java

@@ -3,6 +3,7 @@ package com.jzg.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.annotation.IgnoreTenant;
+import com.jzg.commons.constants.SystemConstants;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.entity.po.*;
 import com.jzg.commons.entity.vo.RolePermissionVo;
@@ -144,22 +145,24 @@ public class UserRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> imp
         sysRoleDataScopeLinkMapper.delete(new LambdaQueryWrapper<SysRoleDataScopeLink>()
               .eq(SysRoleDataScopeLink::getRoleId,sysRole.getId()));
 
-        //保存角色数据权限
-        SysRoleDataScope sysRoleDataScope = new SysRoleDataScope();
-        sysRoleDataScope.setId(IdGenerate.nextId());
-        sysRoleDataScope.setRoleId(sysRole.getId());
-        sysRoleDataScope.setDataMark(sysRoleVo.getDataScope().getDataMark());
-        sysRoleDataScopeMapper.insert(sysRoleDataScope);
-        if(sysRoleDataScope.getDataMark().equals("2") || sysRoleDataScope.getDataMark().equals("1")) {
-            List<SysRoleDataScopeLink> sysRoleDataScopeLinks = new ArrayList<>();
-            sysRoleVo.getDataScope().getDeptIds().forEach(item -> {
-                SysRoleDataScopeLink sysRoleDataScopeLink = new SysRoleDataScopeLink();
-                sysRoleDataScopeLink.setId(IdGenerate.nextId());
-                sysRoleDataScopeLink.setRoleId(sysRole.getId());
-                sysRoleDataScopeLink.setDeptId(item);
-                sysRoleDataScopeLinks.add(sysRoleDataScopeLink);
-            });
-            sysRoleDataScopeLinkMapper.insert(sysRoleDataScopeLinks);
+        //保存角色数据权限  如果是平台则直接跳过
+        if(!baseController.getUserSystemCode().equals(SystemConstants.SYSTEM_PLATFORM.getCode())) {
+            SysRoleDataScope sysRoleDataScope = new SysRoleDataScope();
+            sysRoleDataScope.setId(IdGenerate.nextId());
+            sysRoleDataScope.setRoleId(sysRole.getId());
+            sysRoleDataScope.setDataMark(sysRoleVo.getDataScope().getDataMark());
+            sysRoleDataScopeMapper.insert(sysRoleDataScope);
+            if (sysRoleDataScope.getDataMark().equals("2") || sysRoleDataScope.getDataMark().equals("1")) {
+                List<SysRoleDataScopeLink> sysRoleDataScopeLinks = new ArrayList<>();
+                sysRoleVo.getDataScope().getDeptIds().forEach(item -> {
+                    SysRoleDataScopeLink sysRoleDataScopeLink = new SysRoleDataScopeLink();
+                    sysRoleDataScopeLink.setId(IdGenerate.nextId());
+                    sysRoleDataScopeLink.setRoleId(sysRole.getId());
+                    sysRoleDataScopeLink.setDeptId(item);
+                    sysRoleDataScopeLinks.add(sysRoleDataScopeLink);
+                });
+                sysRoleDataScopeLinkMapper.insert(sysRoleDataScopeLinks);
+            }
         }
 
         if(sysRolePermsMapper.insert(sysRolePermsList).stream().count() > 0 && baseMapper.updateById(sysRole) > 0){