Merge branch 'dev' into pre-production

8 months ago · a32fa0e6dc
1 changed files with 3 additions and 0 deletions
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataFactoryCategoryMapper.xml
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataFactoryCategoryMapper.xml
@ -10,6 +10,9 @@
        <if test="param.type != null ">
            and type = #{param.type}
        </if>
+        <if test="param.brand != null and param.brand != ''">
+            and brand = #{param.brand}
+        </if>
        <if test="param.category != null and param.category != ''">
            and category = #{param.category}
        </if>