From 2db191d2c36c490f27a9e985005ef8cf4df261ee Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期一, 15 七月 2024 10:17:26 +0800
Subject: [PATCH] solve some bug
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java
index 58a8910..6bc3abd 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java
@@ -170,9 +170,13 @@
}
public StaAssemblyWorkLast getWorkLast(String workId) {
+ if(StringUtils.isBlank(workId)){
+ throw new RuntimeException("鐧诲綍ID涓虹┖,璇疯仈绯荤鐞嗗憳鏌ョ湅骞惰В鍐抽棶棰�.");
+ }
StaAssemblyWorkLast result = assemblyWorkLastDao.selectByPrimaryKey(Long.parseLong(workId));
if (result == null) {
- return null;
+ throw new RuntimeException("绯荤粺涓病鏈夎鏉＄櫥褰曚俊鎭�");
+ //return null;
}
BaUser userInfo = getUserInfo(result.getUserId().toString());
PltStation stationInfo = getStationInfo(result.getStationId().toString());
@@ -184,6 +188,7 @@
//鐩存帴鍒犻櫎璁板綍
logout(result.getId().toString());
result.setId(null);
+ result.setStatus(STATUS_WORK_LAST_LOGOUT);
if(userInfo == null){
result.setUserId(null);
result.setUserName("");
--
Gitblit v1.8.0