From 5325dfb2fda7bd21bcbcf3c8c10be1ac95793d86 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 05 八月 2024 20:40:48 +0800
Subject: [PATCH] 检验下单的委托人如果制单人的委托单位与选择的委托单位不一致,则委托人必须要进行填写,如果一致那么委托人就默认是制单人+.检验设备第一次进来直接所有样品的这个项目全部使用该设备,第二次修改就只针对当前样品

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

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTemplateServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTemplateServiceImpl.java
index 44557db..04ce217 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTemplateServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTemplateServiceImpl.java
@@ -47,6 +47,9 @@
 
     @Override
     public int upStandardTemplate(StandardTemplate standardTemplate) {
+        if(standardTemplate.getThing().equals("")){
+            standardTemplate.setThing(null);
+        }
         return standardTemplateMapper.updateById(standardTemplate);
     }
 
@@ -62,15 +65,26 @@
 
     @Override
     public String getStandTempThingById(Integer templateId) {
-        return standardTemplateMapper.selectById(templateId).getThing();
+        StandardTemplate standardTemplate = standardTemplateMapper.selectById(templateId);
+        if(standardTemplate==null){
+            return null;
+        }else{
+            return standardTemplate.getThing();
+        }
     }
 
     @Override
     public String getStandTempNameById(Integer templateId) {
-        return standardTemplateMapper.selectById(templateId).getName();
+        StandardTemplate standardTemplate = standardTemplateMapper.selectById(templateId);
+        if(standardTemplate==null){
+            return null;
+        }else{
+            return standardTemplate.getName();
+        }
     }
-}
 
-
-
-
+    @Override
+    public StandardTemplate getStandTempIdByName(String name) {
+        return standardTemplateMapper.getStandTempIdByName(name);
+    }
+}
\ No newline at end of file

--
Gitblit v1.9.3