2025-10-13

查询列表修改

src/entity/program.entity.ts

@@ -85,9 +85,10 @@ export class ProgramEntity {
     })
     createDate: Date | null;
 
+    user: any;
 
-    page: number = 1;
-    size: number = 10;
+    page: number;
+    size: number;
 
     currentLoginId: number;
 

src/service/program.service.ts

@@ -31,16 +31,14 @@ export class ProgramService {
 
             if (program.keyword) {
                 queryBuilder.orWhere('program.name like :name', {name: `%${program.keyword}%`});
+                queryBuilder.orWhere('program.company like :company', {company: `%${program.keyword}%`});
+                queryBuilder.orWhere('program.address like :address', {address: `%${program.keyword}%`});
             }
 
             if (program.linkmanId) {
                 queryBuilder.orWhere('program.linkmanId like :linkmanId', {linkmanId: `%${program.linkmanId}%`});
             }
 
-            if (program.keyword) {
-                queryBuilder.orWhere('program.company like :company', {company: `%${program.keyword}%`});
-            }
-
             queryBuilder
                 .orderBy('program.createDate', 'DESC')
                 .take(program.size || 10)