From 342e2b3a98a33c0f64893986fc9ceae8cdd10b23 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期二, 29 十一月 2022 22:01:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs
---
src/main/java/com/zy/asrs/controller/WrkMastController.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastController.java b/src/main/java/com/zy/asrs/controller/WrkMastController.java
index c88c186..7a49786 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastController.java
@@ -101,6 +101,11 @@
WrkMast wrkMast1=null;
try{
wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkMast.getWrkNo()));
+ if (Cools.isEmpty(wrkMast1) || null==wrkMast1.getWrkNo()){
+ return R.error("宸ヤ綔鍙峰紓甯�");
+ }else if (wrkMast1.getWrkSts()==null){
+ return R.error("淇敼鐘舵�佸紓甯�");
+ }
}catch (Exception e){
return R.error("鏌ヨ宸ヤ綔妗ｅけ璐ワ紝璇峰皾璇曞埛鏂伴〉闈€��");
}
--
Gitblit v1.9.1