修改bug#40897

jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectMapper.xml

@@ -22,9 +22,6 @@
         LEFT JOIN pay_member_project pmp  ON pmp.id = pmps.project_id
         LEFT JOIN pay_pack_company_project ppcp ON ppcp.project_id = pmps.id
         LEFT JOIN pay_pack_company ppc ON ppc.id = ppcp.pack_id
-        <if test="pack == 1 and packYear != '' and packYear != null">
-            AND ppc.pack_year=#{packYear}
-        </if>
         LEFT JOIN pay_income_contract_associated pica ON pica.project_id = pmps.id
         WHERE pmps.company_id =#{companyId} AND pmp.id IS NOT NULL AND pmp.id != ''
         AND (pica.id is null OR pica.id = '')
@@ -32,7 +29,7 @@
             AND pmp.project_name like concat('%',concat(#{memberName},'%'))
         </if>
         <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 pmp.id ORDER BY pmp.create_time DESC
     </select>