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

gongchunyi

23 小时以前 2d1e904f3049218474318cb1e2fe5c3a3869cfb0

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

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

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