Merge remote-tracking branch 'origin/master'

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

@@ -13,6 +13,6 @@ public class ParameterVO {
     private int numCreateUser;        // 可创建子账户数量
     private int numCreateScenePackage;       // 最多可创建场景测试包数量
     private int numScenePerPackage;        // 场景测试包最大场景数量
-    private Date modifyTime;        // 创建时间
+    private Date createTime;        // 创建时间
 
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/ctrl/ScenePackageController.java

@@ -132,6 +132,12 @@ public class ScenePackageController {
         }
         if(ObjectUtil.isNotNull(map)){
             map.put("creatNum",creatNum);
+        }else{
+            Map map1=new HashMap();
+            map1.put("creatNum",0);
+            map1.put("numCreateScenePackage",0);
+            map1.put("numScenePerPackage",0);
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS,map1);
         }
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS,map);
     }

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

@@ -90,6 +90,9 @@ public class UserService {
             //新增参数校验
             if(ObjectUtil.isNull(userPO.getId())){
                 ParameterVO parameter = parameterService.getParameterByUserId();
+                if(ObjectUtil.isNull(parameter)){
+                    return null;
+                }
                 int num = parameter.getNumCreateUser();//最大用户数
                 int subUserNum = 0;
                 String userId = AuthUtil.getCurrentUserId();

simulation-resource-server/src/main/resources/mapper/system/ParameterMapper.xml

@@ -12,7 +12,7 @@
         IFNULL(p.num_create_user,0) as num_create_user,
         IFNULL(p.num_create_scene_package,0) as num_create_scene_package,
         IFNULL(p.num_scene_per_package,0) as  num_scene_per_package,
-        p.modify_time
+        p.create_time
         from system_user u
         left join system_parameter p on u.id = p.user_id
         where