From fc7e4d3a79dc5808cddc864e1d235fea92c4f627 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期日, 23 六月 2024 23:43:57 +0800
Subject: [PATCH] bug修复

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

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
index e08aba6..c0339db 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
@@ -200,7 +200,7 @@
                 }
                 str.setInspectionItem(list.get(4) + "");
                 if (list.get(6) == null) {
-                    str.setInspectionItemSubclass(null);
+                    str.setInspectionItemSubclass("");
                 } else {
                     str.setInspectionItemSubclass(list.get(6).toString());
                 }
@@ -251,7 +251,7 @@
                 str.setFactory("涓ぉ绉戞妧妫�娴嬩腑蹇�");
                 str.setLaboratory(laboratory.get());
                 str.setState(1);
-                str.setTree(str.getFactory() + " - " + str.getLaboratory() + " - " + str.getSampleType() + " - " + (str.getSample() == null?"":str.getSample()) + " - " + (str.getModel() == null?"":str.getModel()));
+                str.setTree(str.getFactory() + " - " + str.getLaboratory() + " - " + str.getSampleType() + " - " + str.getSample() + " - " + (str.getModel() == null?"":str.getModel()));
                 str.setStructureItemParameterId(standardTreeMapper.getStructureItemParameterId("\""+str.getSampleType()+"\"", str.getInspectionItem(), str.getInspectionItemSubclass()));
                 if(str.getStructureItemParameterId() == null){
                     throw new ErrorException("妫�楠岄」鐩笉瀛樺湪锛�" + str.getInspectionItem() + " " + str.getInspectionItemSubclass());

--
Gitblit v1.9.3