diff --git a/framework/sdk-parent/sdk/src/main/java/io/metersphere/service/ServiceUtils.java b/framework/sdk-parent/sdk/src/main/java/io/metersphere/service/ServiceUtils.java index 22a193cf9c..537528b036 100644 --- a/framework/sdk-parent/sdk/src/main/java/io/metersphere/service/ServiceUtils.java +++ b/framework/sdk-parent/sdk/src/main/java/io/metersphere/service/ServiceUtils.java @@ -388,7 +388,7 @@ public class ServiceUtils { if (MapUtils.isNotEmpty(request.getCombine()) && ObjectUtils.isNotEmpty((request.getCombine().get("customs")))) { List> customs = (List>) request.getCombine().get("customs"); customs.forEach(custom -> { - if(StringUtils.equalsIgnoreCase(custom.get("operator").toString(), "current user")){ + if (StringUtils.equalsIgnoreCase(custom.get("operator").toString(), "current user")) { String userId = SessionUtils.getUserId(); custom.put("value", userId); } @@ -490,7 +490,7 @@ public class ServiceUtils { } public static void buildCombineTagsToSupportMultiple(BaseQueryRequest request) { - if (request.getCombine() != null && request.getCombine().containsKey("tags")) { + if (request != null && request.getCombine() != null && request.getCombine().containsKey("tags")) { Map tagsMap = (Map) request.getCombine().get("tags"); Object tagVal = tagsMap.get("value"); if (tagVal != null) {