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

云

2026-04-17 ac11e0a1320b469a2a111ba3d6a4a54f424845b7

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

@@ -162,7 +162,7 @@
            if((Integer) id.get("staffState") == 0){
                StaffLeave id1 = staffLeaveMapper.selectOne(new LambdaQueryWrapper<StaffLeave>()
                        .eq(StaffLeave::getStaffOnJobId, id.get("id"))
                        .like(StaffLeave::getCreateTime, calculateSalaryDto.getDate()));
                        .like(StaffLeave::getLeaveDate, calculateSalaryDto.getDate()));
                if(id1 == null){
                    continue;
                }