From c09ce992101f0c9eaae165389a7638566ac566a9 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 19 六月 2023 22:18:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 6041858..417080f 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
@@ -1067,6 +1067,12 @@
}
public PageResponse<InoutData> submitHandle(InoutData data) throws Exception {
+
+
+ if (null == data.getHandleUser()) {
+ data.setHandleUser(ContextUtil.getLoginUserCName());
+ }
+
//鑾峰彇绯荤粺鍙傛暟閰嶇疆
InoutSysConf inoutSysConf = inoutCommonService.getCacheInoutSysConf(data.getCompanyId(), data.getDeptId());
if (null == inoutSysConf) {
@@ -1294,7 +1300,7 @@
try {
List<InoutPrice> price = inoutService.getPrice(param);
- if(null == price || price.isEmpty()){
+ if (null == price || price.isEmpty()) {
return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), "鏈幏鍙栧埌绮瀹氫环閰嶇疆淇℃伅");
}
return new PageResponse<>(RespCodeEnum.CODE_0000, price.get(0));
--
Gitblit v1.9.3