From aee2086682ca22accaf50a4600f16cf8cec1e7da Mon Sep 17 00:00:00 2001
From: DirectionOfMind <3182967682@qq.com>
Date: Tue, 5 Jan 2021 18:07:58 +0800
Subject: [PATCH] fix

---
 .../controller/EquipmentController.java       | 22 ++++++++++++-------
 .../entity/model/FindEquipmentResModel.java   |  2 --
 .../impl/EquipmentInfoServiceImpl.java        |  9 ++++++++
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/lz/modules/equipment/controller/EquipmentController.java b/src/main/java/com/lz/modules/equipment/controller/EquipmentController.java
index c9aab97f..7b2c398c 100644
--- a/src/main/java/com/lz/modules/equipment/controller/EquipmentController.java
+++ b/src/main/java/com/lz/modules/equipment/controller/EquipmentController.java
@@ -81,17 +81,23 @@ public class EquipmentController extends AbstractController {
         model.setBrandId(equipmentInfo.getBrandId());
         model.setSpecId(equipmentInfo.getSpecsId());
 
-        Long departmentId = -1L;
-        if(equipmentInfo.getSaiId()!=null){
-            SpecialApplyInfo specialApplyInfo = specialApplyInfoService.selectSpecialApplyInfoById(equipmentInfo.getSaiId());
-        }
-        if(equipmentInfo.getUserId()!=null){
-            DepartmentsStaffRelateEntity entity = departmentsStaffRelateService.selectByStaffId(equipmentInfo.getUserId());
-        }
-        model.setDepartId(departmentId);
+
         int i = tCountMapper.selectMaxNum();
         if(equipmentInfo.getCount()<i){
             logger.info("第" + i + "次盘点" + code);
+            Long departmentId = -1L;
+            if(equipmentInfo.getSaiId()!=null){
+                SpecialApplyInfo specialApplyInfo = specialApplyInfoService.selectSpecialApplyInfoById(equipmentInfo.getSaiId());
+                if(specialApplyInfo != null){
+                    equipmentInfo.setDepartId(Long.valueOf(specialApplyInfo.getId()));
+                }
+            }
+            if(equipmentInfo.getUserId()!=null){
+                DepartmentsStaffRelateEntity entity = departmentsStaffRelateService.selectByStaffId(equipmentInfo.getUserId());
+                if(entity != null && StringUtil.isNotBlank(entity.getDepartmentId())){
+                    equipmentInfo.setDepartId(Long.valueOf(entity.getDepartmentId()));
+                }
+            }
             equipmentInfo.setCount(i);
             iEquipmentInfoService.insertEquipmentInfo(equipmentInfo);
         }
diff --git a/src/main/java/com/lz/modules/equipment/entity/model/FindEquipmentResModel.java b/src/main/java/com/lz/modules/equipment/entity/model/FindEquipmentResModel.java
index dc0451d2..7baaf481 100644
--- a/src/main/java/com/lz/modules/equipment/entity/model/FindEquipmentResModel.java
+++ b/src/main/java/com/lz/modules/equipment/entity/model/FindEquipmentResModel.java
@@ -88,6 +88,4 @@ public class FindEquipmentResModel {
     @ApiModelProperty(value = "是否为员工使用", name = "employee")
     private boolean employee = true;
 
-    private Long departId;
-
 }
diff --git a/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java b/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java
index c93bec3a..a3110db9 100644
--- a/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java
+++ b/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java
@@ -8,7 +8,9 @@ import com.lz.common.exception.ZSException;
 import com.lz.common.utils.ISelect;
 import com.lz.common.utils.PageUtils;
 import com.lz.common.utils.StringUtil;
+import com.lz.modules.app.entity.DepartmentsStaffRelateEntity;
 import com.lz.modules.app.entity.StaffEntity;
+import com.lz.modules.app.service.DepartmentsStaffRelateService;
 import com.lz.modules.app.service.StaffService;
 import com.lz.modules.equipment.dao.*;
 import com.lz.modules.equipment.entity.*;
@@ -56,6 +58,8 @@ public class EquipmentInfoServiceImpl extends ServiceImpl<EquipmentInfoMapper, E
 	private EquipmentSpecsMapper equipmentSpecsMapper;
     @Autowired
 	private TCountMapper tCountMapper;
+	@Autowired
+	private DepartmentsStaffRelateService departmentsStaffRelateService;
 
 
 
@@ -137,6 +141,10 @@ public class EquipmentInfoServiceImpl extends ServiceImpl<EquipmentInfoMapper, E
 				insert.setUser(employeesInfo.getName());
 				insert.setUserId(employeesInfo.getId());
 				insert.setSaiId(null);
+				DepartmentsStaffRelateEntity entity = departmentsStaffRelateService.selectByStaffId(employeesInfo.getId());
+				if(entity != null && StringUtil.isNotBlank(entity.getDepartmentId())){
+					insert.setDepartId(Long.valueOf(entity.getDepartmentId()));
+				}
 			}else {
 				SpecialApplyInfo specialApplyInfo = specialApplyInfoMapper.selectSpecialApplyInfoById(dto.getUserId());
 				if(specialApplyInfo==null){
@@ -145,6 +153,7 @@ public class EquipmentInfoServiceImpl extends ServiceImpl<EquipmentInfoMapper, E
 				insert.setUser(specialApplyInfo.getTypeDesc());
 				insert.setSaiId(specialApplyInfo.getId());
 				insert.setUserId(null);
+				insert.setDepartId(specialApplyInfo.getId());
 			}
 			insert.setCount(i);
 			equipmentInfoMapper.insert(insert);