From 997925036e3c4dc1c6a61fb516fa9c513b004a63 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 13 一月 2021 17:22:01 +0800
Subject: [PATCH] 修改危废接口

---
 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 3e28bcc..fc6e474 100644
--- a/src/main/java/com/nanometer/smartlab/api/ApiAction.java
+++ b/src/main/java/com/nanometer/smartlab/api/ApiAction.java
@@ -1611,14 +1611,15 @@
     public Object putWasteInfo(@RequestBody HazardousWaste hazardousWaste){
         try {
             if (StringUtils.isBlank(hazardousWaste.getDepartment()) || StringUtils.isBlank(hazardousWaste.getApplyPerson())
-            || StringUtils.isBlank(hazardousWaste.getProject()) || StringUtils.isBlank(hazardousWaste.getUnit())
-                    || StringUtils.isBlank(hazardousWaste.getCreator())){
-                return  ResponseModel.getErrInstance("部门、单位、课题组、确认者、创建者、不能为空");
+            || StringUtils.isBlank(hazardousWaste.getProject()) || StringUtils.isBlank(hazardousWaste.getCreator())){
+                return  ResponseModel.getErrInstance("部门、课题组、确认者、创建者、不能为空");
             }
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
             hazardousWaste.setTid(sdf.format(new Date()));
             hazardousWaste.setCreateTime(new Date());
             hazardousWaste.setStatus("待确认");
+            HazardousWasteUser sysUser = sysUserService.getUserByAccount(hazardousWaste.getApplyPerson());
+            hazardousWaste.setUnit( sysUser.getCompany());
             if (hazardousWaste.getAcid()== null){
                 hazardousWaste.setAcid(new BigDecimal(0));
             }

--
Gitblit v1.9.2