修改用户等

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

@@ -198,53 +198,53 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
                     this.update(staffEntity);
                 }
 
-                if (staffCollect.size() > 0) {
-                    //需要将此人员变更为离职
-
-                    staffCollect.entrySet().stream().forEach(item -> {
-
-                        String key = item.getKey();
-                        if (!ObjectUtils.isEmpty(key)) {
-                            StaffEntity staff = item.getValue();
-                            staff.setStatus(StaffSatusEnum.离职.getValue());
-                            staff.setUpdateTime(new Date());
-                            staff.setUpdateUserId(1L);
-                            this.update(staff);
-
-                            //新增离职人员
-                            StaffLeaveEntity staffLeaveEntity = new StaffLeaveEntity();
-                            staffLeaveEntity.initAttrValue();
-                            staffLeaveEntity.setStaffId(staff.getId());
-                            staffLeaveEntity.setStaffName(staff.getName());
-                            staffLeaveEntity.setGender(staff.getGender());
-                            staffLeaveEntity.setBirthday(staff.getBirthday());
-                            staffLeaveEntity.setPhotoPath(staff.getPhotoPath());
-                            staffLeaveEntity.setPhoneNumber(staff.getPhoneNumber());
-                            staffLeaveEntity.setIdCard(staff.getIdCard());
-                            staffLeaveEntity.setWorkNum(staff.getWorkNum());
-                            staffLeaveEntity.setPoliticalstatus(staff.getPoliticalstatus());
-                            staffLeaveEntity.setDeptId(staff.getDeptId());
-                            staffLeaveEntity.setDeptName(staff.getDeptName());
-                            staffLeaveEntity.setJobId(staff.getPositionId());
-                            staffLeaveEntity.setJobName(staff.getPositionName());
-                            staffLeaveEntity.setStaffType(staff.getStaffType());
-                            staffLeaveEntity.setStatus(StaffSatusEnum.离职.getValue());
-                            staffLeaveEntity.setLeaveDate(new Date());
-                            staffLeaveEntity.setLeaveReason("");
-                            staffLeaveEntity.setAuditStatus(AuditStatusEnum.通过.getValue());
-                            staffLeaveEntity.setCreateUserId(1L);
-                            staffLeaveEntity.setCreateTime(new Date());
-
-                            StaffLeaveQuery staffLeaveQuery = new StaffLeaveQuery();
-                            staffLeaveQuery.setWorkNum(staff.getWorkNum());
-
-                            int count = staffLeaveService.count(staffLeaveQuery, null);
-                            if (count == 0) {
-                                staffLeaveService.save(staffLeaveEntity);
-                            }
+            }
+            if (staffCollect.size() > 0) {
+                //需要将此人员变更为离职
+
+                staffCollect.entrySet().stream().forEach(item -> {
+
+                    String key = item.getKey();
+                    if (!ObjectUtils.isEmpty(key)) {
+                        StaffEntity staff = item.getValue();
+                        staff.setStatus(StaffSatusEnum.离职.getValue());
+                        staff.setUpdateTime(new Date());
+                        staff.setUpdateUserId(1L);
+                        this.update(staff);
+
+                        //新增离职人员
+                        StaffLeaveEntity staffLeaveEntity = new StaffLeaveEntity();
+                        staffLeaveEntity.initAttrValue();
+                        staffLeaveEntity.setStaffId(staff.getId());
+                        staffLeaveEntity.setStaffName(staff.getName());
+                        staffLeaveEntity.setGender(staff.getGender());
+                        staffLeaveEntity.setBirthday(staff.getBirthday());
+                        staffLeaveEntity.setPhotoPath(staff.getPhotoPath());
+                        staffLeaveEntity.setPhoneNumber(staff.getPhoneNumber());
+                        staffLeaveEntity.setIdCard(staff.getIdCard());
+                        staffLeaveEntity.setWorkNum(staff.getWorkNum());
+                        staffLeaveEntity.setPoliticalstatus(staff.getPoliticalstatus());
+                        staffLeaveEntity.setDeptId(staff.getDeptId());
+                        staffLeaveEntity.setDeptName(staff.getDeptName());
+                        staffLeaveEntity.setJobId(staff.getPositionId());
+                        staffLeaveEntity.setJobName(staff.getPositionName());
+                        staffLeaveEntity.setStaffType(staff.getStaffType());
+                        staffLeaveEntity.setStatus(StaffSatusEnum.离职.getValue());
+                        staffLeaveEntity.setLeaveDate(new Date());
+                        staffLeaveEntity.setLeaveReason("");
+                        staffLeaveEntity.setAuditStatus(AuditStatusEnum.通过.getValue());
+                        staffLeaveEntity.setCreateUserId(1L);
+                        staffLeaveEntity.setCreateTime(new Date());
+
+                        StaffLeaveQuery staffLeaveQuery = new StaffLeaveQuery();
+                        staffLeaveQuery.setWorkNum(staff.getWorkNum());
+
+                        int count = staffLeaveService.count(staffLeaveQuery, null);
+                        if (count == 0) {
+                            staffLeaveService.save(staffLeaveEntity);
                         }
-                    });
-                }
+                    }
+                });
             }
         }