From 61f7981ee58bd858383202e1d798ac537cf5a154 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Thu, 16 Jan 2025 13:32:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/service/impl/ResultServiceImpl.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) 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(); } }