src/application/core-service/core-service.service.ts

@@ -176,19 +176,21 @@ export class CoreServiceService {
         // 定义基础查询函数
         const buildBaseQuery = (selectData = undefined) => {
             // 启用动态查询模式 $dynamic
-            const query = this.mysqlService.db.select(selectData).from(pacCoreService).$dynamic();
+            let query = this.mysqlService.db.select(selectData).from(pacCoreService).$dynamic();
-
+
-            const wl = [];
+            // 根据条件添加额外的WHERE子句
-
+            if (getCoreServiceDto.serviceInfo) {
-            wl.push(
+                query = query.where(
-                or(
+                    and(
-                    like(pacCoreService.serviceKey, likeQuery(getCoreServiceDto.serviceInfo)),
+                        or(
-                    like(pacCoreService.serviceName, likeQuery(getCoreServiceDto.serviceInfo)),
+                            like(pacCoreService.serviceKey, likeQuery(getCoreServiceDto.serviceInfo)),
-                    like(pacCoreService.serviceDesc, likeQuery(getCoreServiceDto.serviceInfo)),
+                            like(pacCoreService.serviceName, likeQuery(getCoreServiceDto.serviceInfo)),
-                ).if(getCoreServiceDto.serviceInfo),
+                            like(pacCoreService.serviceDesc, likeQuery(getCoreServiceDto.serviceInfo)),
-            );
+                        ),
-            wl.push(isNull(pacCoreService.deleteby));
+                        isNull(pacCoreService.deleteby),
-            query.where(and(...wl));
+                    ),
+                );
+            }
 
             return query;
         };