Merge remote-tracking branch 'origin/master'

2024-11-13 15:00:50 +08:00 · 2024-11-13 15:00:50 +08:00 · b83849ccea
commit b83849ccea
parent a2b894ecd6 efa65b6327
1 changed files with 1 additions and 1 deletions
--- a/ktg-mes/src/main/resources/mapper/md/BaseKnifeMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/md/BaseKnifeMapper.xml
@ -578,7 +578,7 @@
            <if test="isLocked != null">
                and IS_LOCKED = #{isLocked}
            </if>
-            and RESET_COUNT = 0
+            and (RESET_COUNT = 0 OR RESET_COUNT IS NULL)
            and KNIFE_LIFE = 0
            and (KNIFE_FINE_STATE = 0 OR KNIFE_FINE_STATE = 1)
        </where>