平台角色添加bug

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

@@ -115,23 +115,26 @@ public class UserRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> imp
         });
         SysRoleDataScope sysRoleDataScope = new SysRoleDataScope();
         sysRoleDataScope.setRoleId(sysRole.getId());
-        sysRoleDataScope.setDataMark(sysRoleVo.getDataScope().getDataMark());
-        sysRoleDataScopeMapper.insert(sysRoleDataScope);
-        if (sysRoleVo.getDataScope().getDataMark().equals("2") || sysRoleVo.getDataScope().getDataMark().equals("1")) {
-            List<SysRoleDataScopeLink> sysRoleDataScopeLinks = new ArrayList<>();
-            if (!Objects.isNull(sysRoleVo.getDataScope().getDeptIds())) {
-                if (!sysRoleVo.getDataScope().getDeptIds().isEmpty()) {
-                    sysRoleVo.getDataScope().getDeptIds().forEach(item -> {
-                        SysRoleDataScopeLink sysRoleDataScopeLink = new SysRoleDataScopeLink();
-                        sysRoleDataScopeLink.setId(IdGenerate.nextId());
-                        sysRoleDataScopeLink.setRoleId(sysRole.getId());
-                        sysRoleDataScopeLink.setDeptId(item);
-                        sysRoleDataScopeLinks.add(sysRoleDataScopeLink);
-                    });
+        if(Objects.nonNull(sysRoleVo.getDataScope())) {
+            sysRoleDataScope.setDataMark(sysRoleVo.getDataScope().getDataMark());
+            sysRoleDataScopeMapper.insert(sysRoleDataScope);
+            if (sysRoleVo.getDataScope().getDataMark().equals("2") || sysRoleVo.getDataScope().getDataMark().equals("1")) {
+                List<SysRoleDataScopeLink> sysRoleDataScopeLinks = new ArrayList<>();
+                if (!Objects.isNull(sysRoleVo.getDataScope().getDeptIds())) {
+                    if (!sysRoleVo.getDataScope().getDeptIds().isEmpty()) {
+                        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);
             }
-            sysRoleDataScopeLinkMapper.insert(sysRoleDataScopeLinks);
         }
+
         if(sysRolePermsMapper.insert(sysRolePermsList).stream().count() > 0 && baseMapper.insert(sysRole) > 0){
             return true;
         }