From f8c59e29e74bf47b80b3b28422a27eedd74ed0c6 Mon Sep 17 00:00:00 2001
From: zt <seesawgzz@gmail.com>
Date: Tue, 25 Mar 2025 20:33:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/web/controller/common/AnnexController.java  | 3 ++-
 .../ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

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<String> list = Arrays.asList("1", "2");
+		List<String> notRecruitList = Arrays.asList("0");
 		String annexType = dto.getAnnexType();
 		LambdaQueryWrapper<Annex> wrapper = Wrappers.<Annex>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<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()).