diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java index d9cd8c06..9a281f63 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java @@ -144,7 +144,12 @@ public class PayIncomeContractController extends JeroController page = new Page<>(pageNo, pageSize); IPage pageList = payIncomeContractService.queryCompanyPageList(page, payIncomeContract); return Result.OK(pageList); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml index fc4147ce..2aa4448a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml @@ -237,7 +237,14 @@ INNER JOIN tb_member_project_subitem tmsub ON tmember.id=tmsub.project_id where tmember.project_name IS NOT NULL AND tmember.project_name != '' ) project ON project.id = pica.project_id - signed_contacts_id = #{payIncomeContract.signedContactsId} + + + and signed_company_id = #{payIncomeContract.signedCompanyId} + + + and signed_contacts_id = #{payIncomeContract.signedContactsId} + + AND (pic.contract_name LIKE concat('%',concat(#{payIncomeContract.contractName},'%')) OR pic.contract_num LIKE concat('%',concat(#{payIncomeContract.contractName},'%'))