修改员工导出

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

@@ -86,8 +86,9 @@ public class PerformAttendRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
         }
         entity.setErrorResult(entity.getRuleName());
         entity.setDeductTime(new Date());
-        entity.setDeductPerson(context == null ? "" : context.getUser() == null ? "" : context.getUser().getRealName());
-
+        if(ObjectUtils.isEmpty(entity.getDeductPerson())){
+            entity.setDeductPerson(context == null ? "" : context.getUser() == null ? "" : context.getUser().getRealName());
+        }
         if (!ObjectUtils.isEmpty(entity.getAttendanceGroupId())) {
             AttendanceGroupEntity attendanceGroupEntity = attendanceGroupService.get(entity.getAttendanceGroupId());
             entity.setAttendanceGroupName(attendanceGroupEntity == null ? "" : attendanceGroupEntity.getGroupName());

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

@@ -67,8 +67,9 @@ public class PerformComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Pe
         }
 
         entity.setDeductTime(new Date());
-        entity.setDeductPerson(context == null ? "" : context.getUser() == null ? "" : context.getUser().getRealName());
-
+        if(ObjectUtils.isEmpty(entity.getDeductPerson())){
+            entity.setDeductPerson(context == null ? "" : context.getUser() == null ? "" : context.getUser().getRealName());
+        }
     }
 
     @Override

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

@@ -66,8 +66,9 @@ public class PerformEffectRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
             entity.setDeptName(staffCache == null ? "" : staffCache.getDeptName());
         }
         entity.setDeductTime(new Date());
-        entity.setDeductPerson(context == null ? "" : context.getUser() == null ? "" : context.getUser().getRealName());
-
+        if(ObjectUtils.isEmpty(entity.getDeductPerson())){
+            entity.setDeductPerson(context == null ? "" : context.getUser() == null ? "" : context.getUser().getRealName());
+        }
     }
 
     @Override

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

@@ -65,8 +65,9 @@ public class PerformGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
             entity.setDeptName(staffCache == null ? "" : staffCache.getDeptName());
         }
         entity.setDeductTime(new Date());
-        entity.setDeductPerson(context == null ? "" : context.getUser() == null ? "" : context.getUser().getRealName());
-
+        if(ObjectUtils.isEmpty(entity.getDeductPerson())){
+            entity.setDeductPerson(context == null ? "" : context.getUser() == null ? "" : context.getUser().getRealName());
+        }
     }
 
     @Override

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

@@ -67,7 +67,10 @@ public class PerformOtherRecordServiceImpl extends AbstractCRUDServiceImpl<Perfo
         }
 
         entity.setDeductTime(new Date());
-        entity.setDeductPerson(context == null ? "" : context.getUser() == null ? "" : context.getUser().getRealName());
+
+        if(ObjectUtils.isEmpty(entity.getDeductPerson())){
+            entity.setDeductPerson(context == null ? "" : context.getUser() == null ? "" : context.getUser().getRealName());
+        }
 
     }
 

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

@@ -66,8 +66,9 @@ public class PerformReviewRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
             entity.setDeptName(staffCache == null ? "" : staffCache.getDeptName());
         }
         entity.setDeductTime(new Date());
-        entity.setDeductPerson(context == null ? "" : context.getUser() == null ? "" : context.getUser().getRealName());
-
+        if(ObjectUtils.isEmpty(entity.getDeductPerson())){
+            entity.setDeductPerson(context == null ? "" : context.getUser() == null ? "" : context.getUser().getRealName());
+        }
     }
 
     @Override