From e89ff285009707e880eab52b9ba95fa0ba033bbb Mon Sep 17 00:00:00 2001
From: 17602169347 <h17602169347@163.com>
Date: Thu, 20 Apr 2023 09:45:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=B9=E7=AA=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ContractFileServiceImpl.java        | 12 +++++++++++-
 .../scm/basicInformation/tradeupload/ContractBox.vue |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

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<ContractFileMapper, Con
             contract_item0Num++;
             contractFileQueryWrapper.lambda().like(ContractFileEntity::getContractType,contractFilePagination.getContractType());
         }
-
+        if(StringUtil.isNotEmpty(contractFilePagination.getKeyword())){
+            contract_item0Num++;
+            contractFileQueryWrapper.lambda().and(wq -> {
+                // 拼接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`,