From be233df3552414d845cc8d8899de7ab70788d9ed Mon Sep 17 00:00:00 2001 From: expressgy Date: Tue, 2 Jul 2024 18:29:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=8D=E5=8A=A1=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core-service/core-service.service.ts | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/src/application/core-service/core-service.service.ts b/src/application/core-service/core-service.service.ts index 2778770..df5a487 100644 --- a/src/application/core-service/core-service.service.ts +++ b/src/application/core-service/core-service.service.ts @@ -176,21 +176,19 @@ export class CoreServiceService { // 定义基础查询函数 const buildBaseQuery = (selectData = undefined) => { // 启用动态查询模式 $dynamic - let query = this.mysqlService.db.select(selectData).from(pacCoreService).$dynamic(); - - // 根据条件添加额外的WHERE子句 - if (getCoreServiceDto.serviceInfo) { - query = query.where( - and( - or( - like(pacCoreService.serviceKey, likeQuery(getCoreServiceDto.serviceInfo)), - like(pacCoreService.serviceName, likeQuery(getCoreServiceDto.serviceInfo)), - like(pacCoreService.serviceDesc, likeQuery(getCoreServiceDto.serviceInfo)), - ), - isNull(pacCoreService.deleteby), - ), - ); - } + const query = this.mysqlService.db.select(selectData).from(pacCoreService).$dynamic(); + + const wl = []; + + wl.push( + or( + like(pacCoreService.serviceKey, likeQuery(getCoreServiceDto.serviceInfo)), + like(pacCoreService.serviceName, likeQuery(getCoreServiceDto.serviceInfo)), + like(pacCoreService.serviceDesc, likeQuery(getCoreServiceDto.serviceInfo)), + ).if(getCoreServiceDto.serviceInfo), + ); + wl.push(isNull(pacCoreService.deleteby)); + query.where(and(...wl)); return query; };