From cb493b0a3f4669ed027823bd9f5927a3abff0130 Mon Sep 17 00:00:00 2001
From: Sun_sun <469361609@qq.com>
Date: Mon, 13 Oct 2025 10:16:17 +0800
Subject: [PATCH] =?UTF-8?q?2025-10-13=20=E6=9F=A5=E8=AF=A2=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/entity/program.entity.ts   | 5 +++--
 src/service/program.service.ts | 6 ++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/entity/program.entity.ts b/src/entity/program.entity.ts
index 9ad3462..31d2e21 100644
--- a/src/entity/program.entity.ts
+++ b/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;
 
diff --git a/src/service/program.service.ts b/src/service/program.service.ts
index cf907af..4dbffa7 100644
--- a/src/service/program.service.ts
+++ b/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)