Merge remote-tracking branch 'origin/dev_New' into dev_New

buhuazhen

2 天以前 9a5d984a74d5f893fc51366b42391d9b4f8a83ed

 src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java

@@ -55,6 +55,9 @@
    private StaffLeaveMapper staffLeaveMapper;

    @Autowired
    private PersonalAttendanceRecordsMapper personalAttendanceRecordsMapper;

    @Autowired
    private SysUserServiceImpl sysUserService;

    @Autowired
@@ -215,6 +218,8 @@
        staffOnJobMapper.deleteBatchIds(ids);
        // 删除离职数据
        staffLeaveMapper.delete(Wrappers.<StaffLeave>lambdaQuery().in(StaffLeave::getStaffOnJobId, ids));
        // 删除打卡记录
        personalAttendanceRecordsMapper.delete(Wrappers.<PersonalAttendanceRecords>lambdaQuery().in(PersonalAttendanceRecords::getStaffOnJobId, ids));
        // 删除用户数据
        List<SysUser> sysUsers = sysUserMapper.selectList(Wrappers.<SysUser>lambdaQuery()
                .in(SysUser::getUserName, staffOnJobs.stream().map(StaffOnJob::getStaffNo).collect(Collectors.toList())));