From 3b794f56dcd6e902a9ee06bdf84326664290884b Mon Sep 17 00:00:00 2001
From: zelian_wu <zelian.wu@xujiesoft.com>
Date: Tue, 20 Feb 2024 15:32:16 +0800
Subject: [PATCH] =?UTF-8?q?2024-02-20=20=E6=B5=8B=E8=AF=95=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E4=BA=A7=E5=93=81=E7=BB=93=E6=9E=84,=E5=B7=A5?=
 =?UTF-8?q?=E8=89=BA=E8=B7=AF=E7=BA=BF,=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/base/PropertiesMapper.xml          | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/main/resources/mapper/base/PropertiesMapper.xml b/src/main/resources/mapper/base/PropertiesMapper.xml
index 8210985e..5e9459ef 100644
--- a/src/main/resources/mapper/base/PropertiesMapper.xml
+++ b/src/main/resources/mapper/base/PropertiesMapper.xml
@@ -21,15 +21,15 @@
         ItemType
     FROM plm_properties_item
     <where>
-        site = #{site}
-         <if test="itemType != null and itemType != ''">
-             and ItemType = #{itemType}
+        site = #{query.site}
+         <if test="query.itemType != null and query.itemType != ''">
+             and ItemType = #{query.itemType}
         </if>
-        <if test="itemNo != null and itemNo != ''">
-            AND ItemNo LIKE '%' + #{itemNo}+'%'
+        <if test="query.itemNo != null and query.itemNo != ''">
+            AND ItemNo LIKE '%' + #{query.itemNo}+'%'
         </if>
-        <if test="itemDesc != null and itemDesc != ''">
-            AND ItemDesc LIKE '%' + #{itemDesc}+'%'
+        <if test="query.itemDesc != null and query.itemDesc != ''">
+            AND ItemDesc LIKE '%' + #{query.itemDesc}+'%'
         </if>
     </where>
     order by  ItemType ,ItemNo
@@ -339,27 +339,27 @@
             version,edit_flag,properties_code_no,dbo.get_properties_codeDesc(site,function_type,properties_code_no) properties_code_desc
         FROM plm_bm_model_header
         <where>
-            site = #{site}
-            <if test="codeNo != null and codeNo != ''">
-                AND code_no like '%' + #{codeNo} +'%'
+            site = #{query.site}
+            <if test="query.codeNo != null and query.codeNo != ''">
+                AND code_no like '%' + #{query.codeNo} +'%'
             </if>
-            <if test="codeDesc != null and codeDesc != ''">
-                AND code_desc like '%' + #{codeDesc} +'%'
+            <if test="query.codeDesc != null and query.codeDesc != ''">
+                AND code_desc like '%' + #{query.codeDesc} +'%'
             </if>
-            <if test="active != null and active != ''">
-                AND active = #{active}
+            <if test="query.active != null and query.active != ''">
+                AND active = #{query.active}
             </if>
-             <if test="buNo != null and buNo != ''">
-                AND bu_no = #{buNo}
+             <if test="query.buNo != null and query.buNo != ''">
+                AND bu_no = #{query.buNo}
             </if>
-            <if test="functionType != null and functionType != ''">
-                and function_type = #{functionType}
+            <if test="query.functionType != null and query.functionType != ''">
+                and function_type = #{query.functionType}
             </if>
-            <if test="editFlag != null and editFlag != ''">
-                and edit_flag = #{editFlag}
+            <if test="query.editFlag != null and query.editFlag != ''">
+                and edit_flag = #{query.editFlag}
             </if>
-            <if test="username != null and username != '' and username != 'admin'">
-                AND bu_no in ( select bu_no from AccessBu where site=#{site} and username=#{username}  )
+            <if test="query.username != null and query.username != '' and query.username != 'admin'">
+                AND bu_no in ( select bu_no from AccessBu where site=#{query.site} and username=#{query.username}  )
             </if>
         </where>
         order by bu_no,order_id