From db05e7296bcef514ae3f204971ebbdd502019041 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期五, 10 五月 2024 13:30:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTemplateServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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..fbbe3e4 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
@@ -62,12 +62,22 @@
@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();
+ }
}
}
--
Gitblit v1.9.3