From 19e6e4e214ea8a67cc944dab80594ab09c7bd459 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com>
Date: Mon, 15 Dec 2025 17:30:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/modules/pms/data/EamObjectInData.java  | 18 ++++++++++++++++++
 .../resources/mapper/pms/EamObjectMapper.xml   | 12 +++++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/data/EamObjectInData.java b/src/main/java/com/xujie/sys/modules/pms/data/EamObjectInData.java
index 80911c36..6444790e 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/EamObjectInData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/EamObjectInData.java
@@ -31,7 +31,25 @@ public class EamObjectInData extends EamObjectData {
     private String orderRef2;
     private String orderRef3;
     private String orderRef4;
+    private String orderRef5;
     private String fileType;
+    private String searchFlag;
+
+    public String getSearchFlag() {
+        return searchFlag;
+    }
+
+    public void setSearchFlag(String searchFlag) {
+        this.searchFlag = searchFlag;
+    }
+
+    public String getOrderRef5() {
+        return orderRef5;
+    }
+
+    public void setOrderRef5(String orderRef5) {
+        this.orderRef5 = orderRef5;
+    }
 
     public String getFileType() {
         return fileType;
diff --git a/src/main/resources/mapper/pms/EamObjectMapper.xml b/src/main/resources/mapper/pms/EamObjectMapper.xml
index 32f9e00f..9b37d3e9 100644
--- a/src/main/resources/mapper/pms/EamObjectMapper.xml
+++ b/src/main/resources/mapper/pms/EamObjectMapper.xml
@@ -204,7 +204,8 @@
         so.order_ref1,
         so.order_ref2,
         so.order_ref3,
-        so.order_ref4
+        so.order_ref4,
+        so.order_ref5
         FROM eam_object as eo
         LEFT JOIN sys_oss as so ON eo.site = so.order_ref1 and eo.bu_no = so.order_ref4 and eo.ObjectID = so.order_ref2
         LEFT JOIN eam_location as el ON eo.site = el.site and eo.LocationID = el.LocationID and eo.bu_no = el.bu_no
@@ -218,6 +219,9 @@
             <if test="query.buDesc != null and query.buDesc != ''">
                 AND dbo.get_bu_desc (eo.site, eo.bu_no) = #{query.buDesc}
             </if>
+            <if test="query.fileName != null and query.fileName != ''">
+                AND so.file_name like '%' + #{query.fileName} +'%'
+            </if>
             <if test="query.objectID != null and query.objectID != ''">
                 AND eo.ObjectID like '%' + #{query.objectID} +'%'
             </if>
@@ -239,6 +243,12 @@
             <if test="query.orderRef3 != null and query.orderRef3 != ''">
                 AND so.order_ref3 = #{query.orderRef3}
             </if>
+            <if test="query.searchFlag != null and query.searchFlag == 1">
+                AND so.file_name is not null
+            </if>
+            <if test="query.searchFlag != null and query.searchFlag == 2">
+                AND so.file_name is  null
+            </if>
         </where>
     </select>