浏览代码

Merge branch 'V2.0.1' into test

zhaoxian 3 年之前
父节点
当前提交
5095d695b8

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/material/mapper/xml/ProductMaterialMapper.xml

@@ -198,7 +198,7 @@
             and t1.start_month >= #{startMonth}
         </if>
         <if test="endMonth!=null">
-            and t1.end_month &lt;= #{endMonth}
+            AND (t1.end_month &lt;= #{endMonth} OR (t1.end_month IS NULL AND t1.start_month &lt;= #{endMonth}))
         </if>
         <if test="itemRun!=null">
             and t1.item_run = #{itemRun}