diff --git a/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java b/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java index 1b654fb6..bb023818 100644 --- a/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java @@ -781,13 +781,15 @@ public class ResultServiceImpl implements IResultService { } private Integer conform(Set numbers) { - if (numbers.size() > 1) { - if (numbers.contains(4)) { - return 4; - } else if (numbers.contains(2)) { - return 2; + if (CollUtil.isNotEmpty(numbers)) { + if (numbers.size() > 1) { + if (numbers.contains(2)) { + return 2; + } } + return numbers.iterator().next(); + } else { + return 4; } - return numbers.iterator().next(); } }