From 0c3f12db38b859274109ce21206f826b89be9bdc Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期四, 01 八月 2024 16:34:55 +0800
Subject: [PATCH] 磨边页面显示：状态100-》101
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
index 0fddaea..d06778e 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
@@ -32,10 +32,14 @@
QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
wrapper.select("Top 1 *").eq("state",1);
TemperingGlassInfo glass=temperingMapper.selectOne(wrapper);
- QueryWrapper<TemperingGlassInfo> glassinfo = new QueryWrapper<>();
- glassinfo.eq("engineer_id",glass.getEngineerId())
- .eq("tempering_layout_id", glass.getTemperingLayoutId());
- return temperingMapper.selectList(glassinfo);
+ if(glass!=null) {
+ QueryWrapper<TemperingGlassInfo> glassinfo = new QueryWrapper<>();
+ glassinfo.eq("engineer_id", glass.getEngineerId())
+ .eq("tempering_layout_id", glass.getTemperingLayoutId());
+ return temperingMapper.selectList(glassinfo);
+ }else {
+ return null;
+ }
}
@Override
--
Gitblit v1.8.0