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

maven

6 天以前 ec3b3bfe38bbde2aecea411c70e1bc868324d9be

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

@@ -54,9 +54,10 @@
        // 新增离职记录
        StaffLeave staffLeave = new StaffLeave();
        staffLeave.setStaffOnJobId(staffLeaveDto.getStaffOnJobId());
        staffLeave.setReason(staffLeaveDto.getReason());
        String reason = staffLeaveDto.getReason();
        if (!StaffLeaveReasonOther.getCode().equals(reason)){
            staffLeave.setRemark("");
        if (StaffLeaveReasonOther.getCode().equals(reason)){
            staffLeave.setRemark(staffLeaveDto.getRemark());
        }
        staffLeaveMapper.insert(staffLeave);