From 6b6ec07be268d3ca61839d9d2d33fc2a709eee4e Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Mon, 6 Jan 2025 10:28:04 +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

---
 .../detection/service/impl/DetectionServiceImpl.java   | 10 ++++++----
 .../gather/result/service/impl/ResultServiceImpl.java  |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java b/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java
index 3438cef4..aa38294c 100644
--- a/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java
+++ b/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java
@@ -1,6 +1,7 @@
 package com.njcn.gather.detection.service.impl;
 
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -653,12 +654,13 @@ public class DetectionServiceImpl {
             data.setData(harmDataList.get(0));
 
             if (ObjectUtil.isNotNull(errSysDtl)) {
-                if (0 == errSysDtl.getErrorValueType()) {
-                    errSysDtl.setMaxErrorValue(multiply(errSysDtl.getMaxErrorValue(), fData, 0));
+                PqErrSysDtls errSys = BeanUtil.copyProperties(errSysDtl, PqErrSysDtls.class);
+                if (0 == errSys.getErrorValueType()) {
+                    errSys.setMaxErrorValue(multiply(errSys.getMaxErrorValue(), fData, 0));
                 }
                 Double v = issueHarmMap.get(harm);
                 data.setResultData(v);
-                setDetection(dataRule, harmDataList, errSysDtl, data, v);
+                setDetection(dataRule, harmDataList, errSys, data, v);
             }
             info.add(data);
         });
@@ -781,7 +783,7 @@ public class DetectionServiceImpl {
                 x.getEndFlag(),
                 channelData)).collect(Collectors.toList());
         if (CollUtil.isNotEmpty(errSysDtls)) {
-            PqErrSysDtls errSysDtl = errSysDtls.get(0);
+            PqErrSysDtls errSysDtl = BeanUtil.copyProperties(errSysDtls.get(0), PqErrSysDtls.class);
             if (DUR.equals(errSysDtl.getScriptType())) {
                 List<Double> qualifiedList = list.stream()
                         .filter(x -> NumberUtil.isIn(BigDecimal.valueOf(x.doubleValue()),
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 bb884256..e407c0ca 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
@@ -790,6 +790,7 @@ public class ResultServiceImpl implements IResultService {
                         .distinct()
                 .select(PqScriptCheckData::getHarmNum)
                 .eq(PqScriptCheckData::getScriptId, param.getScriptId())
+                .isNotNull(PqScriptCheckData::getHarmNum)
                 .eq(PqScriptCheckData::getIndex, param.getIndex())
         );
         List<Double> harmNum = list.stream().map(PqScriptCheckData::getHarmNum).distinct().collect(Collectors.toList());