From 7ed7429feedd93f15210f98659bf7ee29319e297 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 27 十月 2023 16:30:41 +0800
Subject: [PATCH] 熏蒸作业---添加虫害检测单号下拉框
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
index 200a5de..7b88614 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
@@ -397,11 +397,22 @@
}
String loginUser = ContextUtil.getLoginUserCName();
- data.setRegisterUser(loginUser);
- data.setFullWeightUser(loginUser);
- data.setEmptyWeightUser(loginUser);
- data.setHandleUser(loginUser);
- data.setCompleteUser(loginUser);
+ if (StringUtils.isEmpty(data.getRegisterUser())) {
+ data.setRegisterUser(loginUser);
+ }
+ if (StringUtils.isEmpty(data.getFullWeightUser())) {
+ data.setFullWeightUser(loginUser);
+ }
+ if (StringUtils.isEmpty(data.getEmptyWeightUser())) {
+ data.setEmptyWeightUser(loginUser);
+ }
+ if (StringUtils.isEmpty(data.getHandleUser())) {
+ data.setHandleUser(loginUser);
+ }
+ if (StringUtils.isEmpty(data.getCompleteUser())) {
+ data.setCompleteUser(loginUser);
+ }
+
if (null == data.getCompleteTime()) {
data.setCompleteTime(new Date());
}
@@ -414,7 +425,7 @@
if (null == data.getIntelCard()) {
data.setIntelCard(data.getUserId());
}
- if (null != data.getCheckItems()) {
+ if (null != data.getCheckItems() && StringUtils.isEmpty(data.getCheckUser())) {
data.setCheckUser(loginUser);
}
@@ -628,7 +639,7 @@
return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg, data);
}
- if(null != files && files.size()>0){
+ if (null != files && files.size() > 0) {
// 鎵ц闄勪欢淇℃伅
fileService.saveInoutFiles(files, data.getCompanyId(), data.getId(), curProgress);
}
@@ -666,7 +677,7 @@
data);
}
- if(null != files && files.size()>0){
+ if (null != files && files.size() > 0) {
// 鎵ц闄勪欢淇℃伅
fileService.saveInoutFiles(files, data.getCompanyId(), data.getId(), curProgress);
}
--
Gitblit v1.9.3