From 3ec412f3cdc8b114cf629e866a7b7b80687a3442 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 18 一月 2021 10:09:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/java/com/nanometer/smartlab/api/ApiAction.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/api/ApiAction.java b/src/main/java/com/nanometer/smartlab/api/ApiAction.java
index 91c0c46..9f38637 100644
--- a/src/main/java/com/nanometer/smartlab/api/ApiAction.java
+++ b/src/main/java/com/nanometer/smartlab/api/ApiAction.java
@@ -1400,6 +1400,7 @@
lr.setValidFlag(ValidFlag.VALID);
opeLaboratoryReserveService.insert(lr);
+ opeReagentStatus.setStatus(ArrivalStatus.NOREGISTER);
opeReagentStatus.setUserId(reagentReceiving.getApplyUserId());
opeReagentStatus.setHouseId(reagentReceiving.getLabId());
opeReagentStatus.setContainerId(reagentReceiving.getLabContainerId());
@@ -1439,7 +1440,7 @@
return ResponseModel.getErrInstance("账户名为空");
}
- HazardousWasteUser sysUser = sysUserService.getUserByAccount(account);
+ HazardousWasteUser sysUser = sysUserService.getUserByAccount(account,null);
if (sysUser == null){
return ResponseModel.getErrInstance("账户名不存在");
}else{
@@ -1540,8 +1541,8 @@
hazardousWaste.setTid(sdf.format(new Date()));
hazardousWaste.setCreateTime(new Date());
hazardousWaste.setStatus("待确认");
- HazardousWasteUser sysUser = sysUserService.getUserByAccount(hazardousWaste.getApplyPerson());
- hazardousWaste.setUnit( sysUser.getCompany());
+ HazardousWasteUser sysUser = sysUserService.getUserByAccount(null,hazardousWaste.getApplyPerson());
+ hazardousWaste.setUnit(sysUser.getCompany());
if (hazardousWaste.getAcid()== null){
hazardousWaste.setAcid(new BigDecimal(0));
}
--
Gitblit v1.9.2