diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/AnnexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/AnnexController.java index bc533ec..4489fc2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/AnnexController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/AnnexController.java @@ -121,9 +121,10 @@ public class AnnexController extends BaseController { throw new BaseException("信息不存在"); } List list = Arrays.asList("1", "2"); + List notRecruitList = Arrays.asList("0"); String annexType = dto.getAnnexType(); LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() - .eq(Annex::getRecruitId, byId.getRecruitId()) + .eq(!notRecruitList.contains(annexType),Annex::getRecruitId, byId.getRecruitId()) .eq(Annex::getUserId, dto.getUserId()) .eq(Annex::getUserType, WGZ) .eq(!"3".equals(annexType), Annex::getAnnexType, annexType) diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java index 17d0c1f..b8760c5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java @@ -193,7 +193,7 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl attWra = new LambdaQueryWrapper(). eq(WgzAttendance::getUserId, user.getUserId()).