From 005c6ea99e37326d77e705929e97169eff761001 Mon Sep 17 00:00:00 2001
From: DirectionOfMind <3182967682@qq.com>
Date: Wed, 30 Dec 2020 12:11:44 +0800
Subject: [PATCH] fix

---
 .../modules/equipment/controller/EquipmentController.java | 1 +
 .../equipment/service/impl/EquipmentInfoServiceImpl.java  | 8 +++-----
 .../modules/performance/controller/ExportController.java  | 2 +-
 3 files changed, 5 insertions(+), 6 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 0ca05229..34f7c035 100644
--- a/src/main/java/com/lz/modules/equipment/controller/EquipmentController.java
+++ b/src/main/java/com/lz/modules/equipment/controller/EquipmentController.java
@@ -242,4 +242,5 @@ public class EquipmentController extends AbstractController {
         iEquipmentFlowRecordService.insertEquipmentFlowRecord(record);
     }
 
+
 }
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 bd64e8c4..c93bec3a 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
@@ -136,6 +136,7 @@ public class EquipmentInfoServiceImpl extends ServiceImpl<EquipmentInfoMapper, E
 				}
 				insert.setUser(employeesInfo.getName());
 				insert.setUserId(employeesInfo.getId());
+				insert.setSaiId(null);
 			}else {
 				SpecialApplyInfo specialApplyInfo = specialApplyInfoMapper.selectSpecialApplyInfoById(dto.getUserId());
 				if(specialApplyInfo==null){
@@ -143,6 +144,7 @@ public class EquipmentInfoServiceImpl extends ServiceImpl<EquipmentInfoMapper, E
 				}
 				insert.setUser(specialApplyInfo.getTypeDesc());
 				insert.setSaiId(specialApplyInfo.getId());
+				insert.setUserId(null);
 			}
 			insert.setCount(i);
 			equipmentInfoMapper.insert(insert);
@@ -157,6 +159,7 @@ public class EquipmentInfoServiceImpl extends ServiceImpl<EquipmentInfoMapper, E
 				}
 				info.setUser(employeesInfo.getName());
 				info.setUserId(employeesInfo.getId());
+				info.setSaiId(null);
 			}else {
 				SpecialApplyInfo specialApplyInfo = specialApplyInfoMapper.selectSpecialApplyInfoById(dto.getUserId());
 				if(specialApplyInfo==null){
@@ -164,11 +167,6 @@ public class EquipmentInfoServiceImpl extends ServiceImpl<EquipmentInfoMapper, E
 				}
 				info.setUser(specialApplyInfo.getTypeDesc());
 				info.setSaiId(specialApplyInfo.getId());
-			}
-			//根据是否员工重置其他id
-			if(dto.isEmployee()){
-				info.setSaiId(null);
-			}else {
 				info.setUserId(null);
 			}
 			info.setType(equipmentType.getType());
diff --git a/src/main/java/com/lz/modules/performance/controller/ExportController.java b/src/main/java/com/lz/modules/performance/controller/ExportController.java
index 77e614c0..034e4900 100644
--- a/src/main/java/com/lz/modules/performance/controller/ExportController.java
+++ b/src/main/java/com/lz/modules/performance/controller/ExportController.java
@@ -32,6 +32,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -418,5 +419,4 @@ public class ExportController {
 
 
 
-
 }