fix: 修复 组织超级管理员添加权限问题

opsli-base-support/opsli-core/src/main/java/org/opsli/core/security/shiro/realm/JwtRealm.java

@@ -91,7 +91,7 @@ public class JwtRealm extends AuthorizingRealm implements FlagRealm {
                     TokenMsg.EXCEPTION_LOGIN_ACCOUNT_LOCKED);
         }
 
-        // 4. 如果不是超级管理员
+        // 4. 如果不是超级管理员 和 租户管理员
         if(!StringUtils.equals(UserUtil.SUPER_ADMIN, user.getUsername())  &&
                 !TenantUtil.SUPER_ADMIN_TENANT_ID.equals(user.getTenantId()) ){
             // 4.1 账号锁定验证

opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/web/SysOrgRestController.java

@@ -50,6 +50,7 @@ import org.opsli.core.persistence.querybuilder.GenQueryBuilder;
 import org.opsli.core.persistence.querybuilder.QueryBuilder;
 import org.opsli.core.persistence.querybuilder.WebQueryBuilder;
 import org.opsli.core.utils.OrgUtil;
+import org.opsli.core.utils.TenantUtil;
 import org.opsli.core.utils.TreeBuildUtil;
 import org.opsli.core.utils.UserUtil;
 import org.opsli.modulars.system.SystemMsg;
@@ -327,12 +328,18 @@ public class SysOrgRestController extends BaseRestController<SysOrg, SysOrgModel
         // 如果新增的是 根节点数据 则需要验证权限
         if(null != model && TreeBuildUtil.DEF_PARENT_ID.equals(model.getParentId())){
             UserModel currUser = UserUtil.getUser();
-            RoleModel defRoleByUserId = UserUtil.getUserDefRoleByUserId(currUser.getId());
-            if(null == defRoleByUserId ||
-                    StringUtils.isEmpty(defRoleByUserId.getDataScope()) ||
-                    !DictType.DATA_SCOPE_ALL.getValue().equals(defRoleByUserId.getDataScope())){
-                // 无组织机构新增权限
-                throw new ServiceException(SystemMsg.EXCEPTION_ORG_NOT_PERMISSION);
+
+            // 如果不是超级管理员 和 租户管理员
+            if(!StringUtils.equals(UserUtil.SUPER_ADMIN, currUser.getUsername())  &&
+                    !TenantUtil.SUPER_ADMIN_TENANT_ID.equals(currUser.getTenantId()) ){
+
+                RoleModel defRoleByUserId = UserUtil.getUserDefRoleByUserId(currUser.getId());
+                if(null == defRoleByUserId ||
+                        StringUtils.isEmpty(defRoleByUserId.getDataScope()) ||
+                        !DictType.DATA_SCOPE_ALL.getValue().equals(defRoleByUserId.getDataScope())){
+                    // 无组织机构新增权限
+                    throw new ServiceException(SystemMsg.EXCEPTION_ORG_NOT_PERMISSION);
+                }
             }
         }