From 27c0c61e48bfb3e870d44b3b53a820568fcce5d5 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期三, 31 七月 2024 11:11:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pms-parent/pms-global/src/main/resources/mapper/PltProductTestInspectionItemsMapper.xml | 5 +++++
1 files changed, 5 insertions(+), 0 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 3340f44..bb79f06 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltProductTestInspectionItemsMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltProductTestInspectionItemsMapper.xml
@@ -11,6 +11,8 @@
<result property="deleted" column="deleted" jdbcType="TINYINT"/>
<result property="disabled" column="disabled" jdbcType="TINYINT"/>
<result property="sort" column="sort" jdbcType="INTEGER"/>
+ <association property="proName" column="pro_id" javaType="java.lang.Long"
+ select="com.dy.pmsGlobal.daoPlt.PltProductMapper.selectProNameById" fetchType="eager" />
</resultMap>
<sql id="Base_Column_List">
@@ -36,6 +38,9 @@
<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>
</select>
--
Gitblit v1.8.0