1

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;
 }

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>