Merge branch 'KF-30' into 'master'

为空处理，默认羊小咩

See merge request !22

src/main/java/cn/quantgroup/xyqb/controller/middleoffice/user/UserController.java

@@ -90,7 +90,11 @@ public class UserController {
         log.info("根据uuid或者userids 获取用户信息 {}", params);
         List<String> vals = (List<String>) params.get("vals");
         Integer type = (Integer) params.get("type");
-        Integer tenantId = Integer.valueOf(String.valueOf(params.get("tenantId")));
+        String tenantIdStr = String.valueOf(params.getOrDefault("tenantId", TenantUtil.TENANT_DEFAULT));
+        Integer tenantId = TenantUtil.TENANT_DEFAULT;
+        if (!tenantIdStr.equals("")) {
+            tenantId = Integer.valueOf(String.valueOf(params.getOrDefault("tenantId", TenantUtil.TENANT_DEFAULT)));
+        }
 
         if (type == null || (type != 1 && type != 2)) {
             return JsonResult.buildErrorStateResult("type错误", null);