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

maven

2 天以前 c389e908ce76d384171edc6b0fef1814cd689e91

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

@@ -69,8 +69,10 @@
        // 更新对应用户状态为停用
        // 根据员工编号查询用户
        SysUser sysUser = sysUserMapper.selectUserByUserName(staffOnJob.getStaffNo());
        sysUser.setStatus("1");
        sysUserMapper.updateUser(sysUser);
        if (sysUser != null) {
            sysUser.setStatus("1");
            sysUserMapper.updateUser(sysUser);
        }

        // 更新离职状态为离职
        staffOnJob.setStaffState(0);