From 5fd6a177a33b3bf88a4e8e8a8dd287a7cc0b0bbf Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 1 Jul 2022 11:44:29 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=88=B0=E6=A0=87=E5=8D=8F=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/member/controller/PayMemberProjectController.java  | 2 +-
 .../com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java
index 498f40d9..f297ddca 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java
@@ -135,7 +135,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
         // 标协会员
         if (Objects.equals(projectType, PayProjectCommon.PROJECT_TYPE5)) {
             Page<TbMemberProjectSubitem> page = new Page<>(pageNo, pageSize);
-            IPage<TbMemberProjectSubitem> list = tbMemberProjectSubitemService.queryListByCompany(page, companyId, PayProjectCommon.PROJECT_TYPE4, payIncomeContract.getPack(), payIncomeContract.getPackYear());
+            IPage<TbMemberProjectSubitem> list = tbMemberProjectSubitemService.queryListByCompany(page, companyId, PayProjectCommon.PROJECT_TYPE5, payIncomeContract.getPack(), payIncomeContract.getPackYear());
             if (!CollectionUtils.isEmpty(list.getRecords())) {
                 List<TbMemberProjectSubitem> listTbMemberProjectSubitem = list.getRecords();
                 listTbMemberProjectSubitem.forEach(p -> {
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml
index 4a9617c6..fa0bfa5f 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml
@@ -35,7 +35,7 @@
         WHERE tmps.company_id =#{companyId} AND tmp.id IS NOT NULL AND tmp.id != ''
         AND (pica.id is null OR pica.id = '')
         <if test="pack == 1 and packYear != '' and packYear != null">
-            AND (ppc.id is null OR ppc.id ='')
+            AND (ppc.pack_year=#{packYear} or ppc.id is null OR ppc.id ='')
         </if>
         GROUP BY tmps.id ORDER BY tmps.create_time DESC
     </select>