Merge remote-tracking branch 'origin/master'

This commit is contained in:
2025-03-25 20:39:46 +08:00
2 changed files with 3 additions and 2 deletions

View File

@ -193,7 +193,7 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl<WgzPayCalculat
id = byId.getRecruitId();
}
BgtProjectRecruit recruit = iBgtProjectRecruitService.getAppById(id);
BgtUser byId1 = bgtUserService.getById(recruit.getUserId());
BgtUser byId1 = bgtUserService.selectUserByUserId(recruit.getUserId());
//2、查看当前申请结算的天数是否大于剩余天数
LambdaQueryWrapper<WgzAttendance> attWra = new LambdaQueryWrapper<WgzAttendance>().
eq(WgzAttendance::getUserId, user.getUserId()).