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/PltProductQualityInspectionItemsMapper.xml | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 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 9aa68fd..7df4e08 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml
@@ -19,14 +19,14 @@
id,pro_id,item,disabled,sort,
deleted
</sql>
- <sql id="part_Column_List">
- ${alias}.id,
- ${alias}.pro_id,
- ${alias}.item,
- ${alias}.sort,
- ${alias}.disabled,
- ${alias}.deleted
- </sql>
+<!-- <sql id="part_Column_List">-->
+<!-- ${alias}.id,-->
+<!-- ${alias}.pro_id,-->
+<!-- ${alias}.item,-->
+<!-- ${alias}.sort,-->
+<!-- ${alias}.disabled,-->
+<!-- ${alias}.deleted-->
+<!-- </sql>-->
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
@@ -84,6 +84,10 @@
<if test="item != null and item != ''">
t.item like concat('%', #{item}, '%') and
</if>
+ <if test="disabled != null and disabled != ''">
+ t.disabled != 1 and
+ <!--FIND_IN_SET(t.disabled, #{disabled}) and-->
+ </if>
</trim>
order by sort desc
<trim prefix="limit " >
@@ -104,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