From 9bfdf1ff20086c04bbe6576706bfee95c9d7fea0 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期二, 13 八月 2024 10:46:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml
index 975b7eb..7df4e08 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml
@@ -86,7 +86,7 @@
             </if>
             <if test="disabled != null  and disabled != ''">
                 t.disabled != 1  and
-<!--                &#45;&#45; FIND_IN_SET(t.disabled, #{disabled}) and-->
+                <!--FIND_IN_SET(t.disabled, #{disabled}) and-->
             </if>
         </trim>
         order by sort desc
@@ -108,6 +108,9 @@
             <if test="item != null  and item != ''">
                 t.item like concat('%', #{item}, '%') and
             </if>
+            <if test="disabled != null  and disabled != ''">
+                t.disabled != 1  and
+            </if>
         </trim>
     </select>
 

--
Gitblit v1.8.0