From a3ba94e23fec4281502a94221f65cc0567eb02a8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 11 七月 2024 16:57:16 +0800
Subject: [PATCH] 温度循环报告完成

---
 inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
index c5e49a3..6857040 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
@@ -67,6 +67,10 @@
             String[] split = insSample.getFactory().split(" - ");
             String tree = split[0] + " - " + split[1] + " - " + split[2] + " - " + split[3] + " - null";
             list = standardProductListMapper.selectDetail2(insSample.getStandardMethodListId(), 1, tree);
+            if (list.size()==0){
+                String tree1 = split[0] + " - " + split[1] + " - " + split[2] + " - null - " + split[3] ;
+                list = standardProductListMapper.selectDetail2(insSample.getStandardMethodListId(), 1, tree1);
+            }
         }
         list = list.stream().filter(a -> {
             try {
@@ -81,8 +85,8 @@
                         if (Objects.equals(a.getBsm(), "1")) {
                             return true;
                         } else {
-                            if (sections.get(i).contains("&")) {
-                                String[] split = sections.get(i).split("&");
+                            if (sections.get(i).contains("@")) {
+                                String[] split = sections.get(i).split("@");
                                 isIf = getIsIf(split[0], models[1]) && getIsIf(split[1], models[1]);
                             } else {
                                 isIf = getIsIf(sections.get(i), models[1]);

--
Gitblit v1.9.3