|
|
|
@ -176,19 +176,21 @@ export class CoreServiceService { |
|
|
|
|
// 定义基础查询函数
|
|
|
|
|
const buildBaseQuery = (selectData = undefined) => { |
|
|
|
|
// 启用动态查询模式 $dynamic
|
|
|
|
|
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)); |
|
|
|
|
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), |
|
|
|
|
), |
|
|
|
|
); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return query; |
|
|
|
|
}; |
|
|
|
|