From f1345a3249db8427c8c2452d64b3a1888aa54a7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Thu, 25 Sep 2025 17:52:50 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E9=92=A2=E6=9E=84?=
 =?UTF-8?q?=E5=8C=85=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/WmsStructuralPackageMapper.xml     | 43 ++++++++-----------
 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageMapper.xml
index 072d199f..922ed2af 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageMapper.xml
@@ -3,30 +3,25 @@
 <mapper namespace="com.nflg.wms.repository.mapper.WmsStructuralPackageMapper">
 
     <select id="search" resultType="com.nflg.wms.common.pojo.vo.PackageVO">
-        SELECT *
-        FROM (
-            SELECT DISTINCT ON ("no") id,"no","order_no","name",drawing_no,weight,cate,eco,version,remark,enable,create_by
-            ,create_time,update_by,update_time,get_modelnos(model_ids) as "modelNos"
-            FROM wms_structural_package
-            <where>
-                <if test="request.no!=null and request.no!=''">
-                    and ("no" ilike concat('%', #{request.no}, '%') or "name" ilike concat('%', #{request.no}, '%'))
-                </if>
-                <if test="request.eco!=null and request.eco!=''">
-                    and eco ilike concat('%', #{request.eco}, '%')
-                </if>
-                <if test="request.drawingNo!=null and request.drawingNo!=''">
-                    and drawing_no like concat('%', #{request.drawingNo}, '%')
-                </if>
-                <if test="request.modelId!=null">
-                    and find_in_set(#{request.modelId},model_ids)>0
-                </if>
-                <if test="request.type==0">
-                    and latest=true
-                </if>
-            </where>
-            ORDER BY "no",id DESC
-        ) t
+        SELECT *,get_modelnos(model_ids) as "modelNos"
+        FROM wms_structural_package
+        <where>
+            <if test="request.no!=null and request.no!=''">
+                and ("no" ilike concat('%', #{request.no}, '%') or "name" ilike concat('%', #{request.no}, '%'))
+            </if>
+            <if test="request.eco!=null and request.eco!=''">
+                and eco ilike concat('%', #{request.eco}, '%')
+            </if>
+            <if test="request.drawingNo!=null and request.drawingNo!=''">
+                and drawing_no like concat('%', #{request.drawingNo}, '%')
+            </if>
+            <if test="request.modelId!=null">
+                and find_in_set(#{request.modelId},model_ids)>0
+            </if>
+            <if test="request.type==0">
+                and latest=true
+            </if>
+        </where>
         ORDER BY id DESC
     </select>