From 986de1ea52ea40a848a8e8ffe478122850bb03a2 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期二, 13 八月 2024 09:36:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pms-parent/pms-global/src/main/resources/mapper/PltProductTestInspectionItemsMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PltProductTestInspectionItemsMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PltProductTestInspectionItemsMapper.xml
index 454b8b8..dba3670 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltProductTestInspectionItemsMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltProductTestInspectionItemsMapper.xml
@@ -40,7 +40,7 @@
</if>
<if test="disabled != null and disabled != ''">
t.disabled != 1 and
-<!-- FIND_IN_SET(t.disabled, #{disabled}) and-->
+ <!--FIND_IN_SET(t.disabled, #{disabled}) and-->
</if>
</trim>
</select>
@@ -57,6 +57,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>
order by sort desc
<trim prefix="limit " >
--
Gitblit v1.8.0