账户权限

api-common/src/main/java/api/common/pojo/vo/system/ParameterVO.java

@@ -1,10 +1,16 @@
 package api.common.pojo.vo.system;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.Date;
 
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
 public class ParameterVO {
 
     private String id;              // 用户主键（唯一）

simulation-resource-server/src/main/java/com/css/simulation/resource/system/service/ParameterService.java

@@ -69,26 +69,23 @@ public class ParameterService {
             //查询父账户
             userId = AuthUtil.getCreateUserId();
         }
-        HashMap<String, Integer> sceneParam = parameterMapper.getSceneParam(userId);
 
-        return sceneParam;
+        return parameterMapper.getSceneParam(userId);
     }
 
     public ParameterVO getParameterByUserId() {
         String roleCode = AuthUtil.getCurrentUserRoleCode();
-        String userId = AuthUtil.getCurrentUserId();
-        if (DictConstants.ROLE_CODE_ADMIN.equals(roleCode) || DictConstants.ROLE_CODE_SYSADMIN.equals(roleCode)) { //管理员账户
+        String userId;
+        if (DictConstants.ROLE_CODE_ADMIN.equals(roleCode) || DictConstants.ROLE_CODE_SYSADMIN.equals(roleCode)) {
+            //1 管理员账户没有 可创建子账户数量、可创建测试包数量、测试包最大场景数量。
             return null;
-        } else if (DictConstants.ROLE_CODE_SUBUESR.equals(roleCode)) {
-            //查询父账户
-            userId = AuthUtil.getCreateUserId();
-        }
-        ParameterVO param = parameterMapper.getParameterByUserId(userId);
-        if (DictConstants.ROLE_CODE_SUBUESR.equals(roleCode)) { //普通账户子账户设置可创建子账号数量为0
-            param.setNumCreateUser(0);
+        } else if (DictConstants.ROLE_CODE_UESR.equals(roleCode)) {
+            //2 普通账户
+            userId = AuthUtil.getCurrentUserId();
+            return parameterMapper.getParameterByUserId(userId);
+        } else {
+            //3 子账户
+            return new ParameterVO();
         }
-
-        return param;
-
     }
 }