From 039b137ddd37227541f53553e40e1786b7982a2b Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Tue, 11 Jul 2023 16:38:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=8C=BB=E7=96=97=E5=99=A8?=
 =?UTF-8?q?=E6=A2=B0=E4=BF=A1=E6=81=AF=EF=BC=9A=E6=B3=A8=E5=86=8C=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E3=80=81=E4=BA=A7=E5=93=81=E7=BC=96=E7=A0=81=E3=80=81?=
 =?UTF-8?q?=E8=A7=84=E6=A0=BC=E5=9E=8B=E5=8F=B7=E6=90=9C=E7=B4=A2=E6=A1=86?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mybatis/mapper/basic/BasicUdiRelMapper.xml  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mybatis/mapper/basic/BasicUdiRelMapper.xml b/src/main/resources/mybatis/mapper/basic/BasicUdiRelMapper.xml
index 6b5ca5c..2d47697 100644
--- a/src/main/resources/mybatis/mapper/basic/BasicUdiRelMapper.xml
+++ b/src/main/resources/mybatis/mapper/basic/BasicUdiRelMapper.xml
@@ -56,16 +56,16 @@
                      left JOIN basic_udi_product p on bur.uuid = p.uuid
                      left join user_company uc on bur.companyIdFk = uc.id
         <where>
+            <if test="companyIdFk != '' and companyIdFk != null">
+                AND companyIdFk=#{companyIdFk}
+            </if>
             <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
                 AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
             </if>
             <if test="cpmctymc != '' and cpmctymc != null">
                 AND cpmctymc LIKE concat('%', #{cpmctymc}, '%')
             </if>
-<!--            <if test="unionCode != '' and unionCode != null">-->
-<!--&#45;&#45;                 AND nameCode LIKE concat(#{unionCode}, '%')-->
-<!--                AND nameCode=#{unionCode}-->
-<!--            </if>-->
+
             <if test="companyIdFk != '' and companyIdFk != null">
                 AND bur.companyIdFk = #{companyIdFk}
             </if>