LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 企业管理员查询全公司合同

Browse Source
This commit is contained in:
lijiarao
2022-08-16 11:15:54 +08:00
parent 587684311a
commit e9460d7daf
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java
+6 -1
View File
@@ -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);
jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml
+8 -1
View File
@@ -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},'%'))