弹窗修改

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);
         }

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`,