diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java index dea3c0ac..76921315 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java @@ -162,7 +162,17 @@ public class ContractFileServiceImpl extends ServiceImpl { + // 拼接sql + wq.like(ContractFileEntity::getContractCode,contractFilePagination.getKeyword()) + .or() + .like(ContractFileEntity::getContractName,contractFilePagination.getKeyword()) + .or() + .like(ContractFileEntity::getName,contractFilePagination.getKeyword()); + }); + } if (AllIdList.size() > 0) { contractFileQueryWrapper.lambda().in(ContractFileEntity::getId, AllIdList); } diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/ContractBox.vue b/SC-web/src/views/scm/basicInformation/tradeupload/ContractBox.vue index 024ee164..7d30fcb0 100644 --- a/SC-web/src/views/scm/basicInformation/tradeupload/ContractBox.vue +++ b/SC-web/src/views/scm/basicInformation/tradeupload/ContractBox.vue @@ -104,7 +104,7 @@ this.listQuery.contractCode = this.contractCode this.listQuery.contractName = this.contractName this.listQuery.contractType = param.contractType - this.listQuery.menuId = param.menuId + this.listQuery.menuId = '380264320186993413' let listQuery = this.listQuery request({ url: `/api/example/ContractFile/getList`,