修改员工导出

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/InspectApiController.java

@@ -302,7 +302,8 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
         recordEntity.setDeptName(staffEntity.getDeptName());
 
         recordEntity.setDeductTime(new Date());
-        recordEntity.setDeductPerson(staffEntity.getName());
+        StaffEntity custStaff = getStaff(context.getUser().getCustomerId().toString());
+        recordEntity.setDeductPerson(custStaff==null?"系统管理员":custStaff.getName());
 
         recordEntity.setSubAddType(rule.getSubAddType());
         recordEntity.setScore(rule.getScore());
@@ -336,7 +337,8 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
         recordEntity.setStaffName(staffEntity.getName());
 
         recordEntity.setDeductTime(new Date());
-        recordEntity.setDeductPerson(staffEntity.getName());
+        StaffEntity custStaff = getStaff(context.getUser().getCustomerId().toString());
+        recordEntity.setDeductPerson(custStaff==null?"系统管理员":custStaff.getName());
 
         recordEntity.setDeptId(staffEntity.getDeptId());
         recordEntity.setDeptName(staffEntity.getDeptName());
@@ -370,7 +372,8 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
         recordEntity.setDeptName(staffEntity.getDeptName());
 
         recordEntity.setDeductTime(new Date());
-        recordEntity.setDeductPerson(staffEntity.getName());
+        StaffEntity custStaff = getStaff(context.getUser().getCustomerId().toString());
+        recordEntity.setDeductPerson(custStaff==null?"系统管理员":custStaff.getName());
 
         recordEntity.setSubAddType(rule.getSubAddType());
         recordEntity.setScore(rule.getScore());
@@ -400,7 +403,8 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
         recordEntity.setStaffName(staffEntity.getName());
 
         recordEntity.setDeductTime(new Date());
-        recordEntity.setDeductPerson(staffEntity.getName());
+        StaffEntity custStaff = getStaff(context.getUser().getCustomerId().toString());
+        recordEntity.setDeductPerson(custStaff==null?"系统管理员":custStaff.getName());
 
         recordEntity.setDeptId(staffEntity.getDeptId());
         recordEntity.setDeptName(staffEntity.getDeptName());
@@ -430,9 +434,9 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
         //recordEntity.setStaffId(staffEntity.getId());
         recordEntity.setStaffName(staffEntity.getName());
 
-
         recordEntity.setDeductTime(new Date());
-        recordEntity.setDeductPerson(staffEntity.getName());
+        StaffEntity custStaff = getStaff(context.getUser().getCustomerId().toString());
+        recordEntity.setDeductPerson(custStaff==null?"系统管理员":custStaff.getName());
 
         recordEntity.setDeptId(staffEntity.getDeptId());
         recordEntity.setDeptName(staffEntity.getDeptName());
@@ -463,7 +467,8 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
         recordEntity.setStaffName(staffEntity.getName());
 
         recordEntity.setDeductTime(new Date());
-        recordEntity.setDeductPerson(staffEntity.getName());
+        StaffEntity custStaff = getStaff(context.getUser().getCustomerId().toString());
+        recordEntity.setDeductPerson(custStaff==null?"系统管理员":custStaff.getName());
 
         recordEntity.setDeptId(staffEntity.getDeptId());
         recordEntity.setDeptName(staffEntity.getDeptName());

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordServiceImpl.java

@@ -107,7 +107,6 @@ public class AttendanceRecordServiceImpl extends AbstractCRUDServiceImpl<Attenda
                 .count();
         attendStatInfo.setBeLate(beLate);
 
-
         //早退次数
         long leaveEarly = attendanceRecordEntities.parallelStream()
                 .flatMap(item -> item.getAttendanceRecordDetailList().stream())