Merge branch 'main' of http://togy.top/hoto/pac-auth

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();
+            const query = this.mysqlService.db.select(selectData).from(pacCoreService).$dynamic();
 
-            // 根据条件添加额外的WHERE子句
+            const wl = [];
-            if (getCoreServiceDto.serviceInfo) {
+
-                query = query.where(
+            wl.push(
-                    and(
                 or(
                     like(pacCoreService.serviceKey, likeQuery(getCoreServiceDto.serviceInfo)),
                     like(pacCoreService.serviceName, likeQuery(getCoreServiceDto.serviceInfo)),
                     like(pacCoreService.serviceDesc, likeQuery(getCoreServiceDto.serviceInfo)),
-                        ),
+                ).if(getCoreServiceDto.serviceInfo),
-                        isNull(pacCoreService.deleteby),
-                    ),
             );
-            }
+            wl.push(isNull(pacCoreService.deleteby));
+            query.where(and(...wl));
 
             return query;
         };