From 8dda1d097e61d30e80e879674051fb2a714ddf7e Mon Sep 17 00:00:00 2001
From: zelian_wu <zelian.wu@xujiesoft.com>
Date: Thu, 20 Jun 2024 17:41:23 +0800
Subject: [PATCH] 1

---
 .../java/com/gaotao/modules/label/entity/LabelFormat.java   | 2 ++
 .../resources/mapper/label/LabelFormatUserDefaultMapper.xml | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/label/entity/LabelFormat.java b/src/main/java/com/gaotao/modules/label/entity/LabelFormat.java
index 9df48c1..363e1ee 100644
--- a/src/main/java/com/gaotao/modules/label/entity/LabelFormat.java
+++ b/src/main/java/com/gaotao/modules/label/entity/LabelFormat.java
@@ -38,4 +38,6 @@ public class LabelFormat {
     private Date updateTime;
 
     private String category;
+
+    private String printType;
 }
diff --git a/src/main/resources/mapper/label/LabelFormatUserDefaultMapper.xml b/src/main/resources/mapper/label/LabelFormatUserDefaultMapper.xml
index 3f9f28c..f6257a5 100644
--- a/src/main/resources/mapper/label/LabelFormatUserDefaultMapper.xml
+++ b/src/main/resources/mapper/label/LabelFormatUserDefaultMapper.xml
@@ -13,10 +13,10 @@
             lfu.username
         from label_format lf
                  left join label_format_user_default lfu on lf.site = lfu.site and lf.format_id = lfu.format_id
+        <if test="username != null and username != ''">
+            and lfu.username = #{username}
+        </if>
         <where>
-            <if test="username != null and username != ''">
-                and (lfu.username = #{username} or lfu.username is null)
-            </if>
             <if test="site != null and site != ''">
                 and lf.site = #{site}
             </if>