From e9460d7daf595b31548cbb9e35718b78b04990fa Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 16 Aug 2022 11:15:54 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=81=E4=B8=9A=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E6=9F=A5=E8=AF=A2=E5=85=A8=E5=85=AC=E5=8F=B8=E5=90=88?=
 =?UTF-8?q?=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contract/controller/PayIncomeContractController.java | 7 ++++++-
 .../jero/contract/mapper/xml/PayIncomeContractMapper.xml | 9 ++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

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<PayIncomeContrac
 		 if(!StringUtils.isBlank(payIncomeContract.getContractName())){
 			 payIncomeContract.setContractName(oConvertUtils.replaceAllPercent(payIncomeContract.getContractName()));
 		 }
-		 payIncomeContract.setSignedContactsId(sysUser.getId());
+		 //企业管理员-查询全公司
+		 if (sysUser.getIsCompanyManager()) {
+			 payIncomeContract.setSignedCompanyId(sysUser.getCompanyId());
+		 }else {
+			 payIncomeContract.setSignedContactsId(sysUser.getId());
+		 }
 		 Page<PayIncomeContract> page = new Page<>(pageNo, pageSize);
 		 IPage<PayIncomeContract> 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
-        <where> signed_contacts_id = #{payIncomeContract.signedContactsId}
+        <where>
+            <if test="payIncomeContract.signedCompanyId != null and payIncomeContract.signedCompanyId != ''">
+                and signed_company_id = #{payIncomeContract.signedCompanyId}
+            </if>
+            <if test="payIncomeContract.signedContactsId != null and payIncomeContract.signedContactsId != ''">
+               and signed_contacts_id = #{payIncomeContract.signedContactsId}
+            </if>
+
             <if test="payIncomeContract.contractName != null and payIncomeContract.contractName != ''">
                 AND (pic.contract_name LIKE concat('%',concat(#{payIncomeContract.contractName},'%'))
                     OR pic.contract_num LIKE concat('%',concat(#{payIncomeContract.contractName},'%'))