From 591e3b8a10ed15023f3ad9e5a72a887ef89b0bb2 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期一, 26 八月 2024 20:47:46 +0800
Subject: [PATCH] 修改判空方式

---
 pms-parent/pms-global/src/main/resources/mapper/PltProductTestInspectionItemsMapper.xml |   43 ++++++++++++++++++++++++++-----------------
 1 files changed, 26 insertions(+), 17 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..416a260 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,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>
     </select>
 
@@ -50,6 +56,9 @@
             </if>
             <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
@@ -76,38 +85,38 @@
     <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductTestInspectionItems" useGeneratedKeys="true">
         insert into plt_product_test_inspection_items
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                <if test="id != null">id,</if>
-                <if test="proId != null">pro_id,</if>
-                <if test="item != null">item,</if>
-                <if test="deleted != null">deleted,</if>
-                <if test="disabled != null">disabled,</if>
-                <if test="sort != null">sort,</if>
+                <if test="id != null and id !=''">id,</if>
+                <if test="proId != null and proId !=''">pro_id,</if>
+                <if test="item != null and item !=''">item,</if>
+                <if test="deleted != null and deleted !=''">deleted,</if>
+                <if test="disabled != null and disabled !=''">disabled,</if>
+                <if test="sort != null and sort !=''">sort,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-                <if test="id != null">#{id,jdbcType=BIGINT},</if>
-                <if test="proId != null">#{proId,jdbcType=BIGINT},</if>
-                <if test="item != null">#{item,jdbcType=VARCHAR},</if>
-                <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
-                <if test="disabled != null">#{disabled,jdbcType=TINYINT},</if>
-                <if test="sort != null">#{sort,jdbcType=INTEGER},</if>
+                <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
+                <if test="proId != null and proId !=''">#{proId,jdbcType=BIGINT},</if>
+                <if test="item != null and item !=''">#{item,jdbcType=VARCHAR},</if>
+                <if test="deleted != null and deleted !=''">#{deleted,jdbcType=TINYINT},</if>
+                <if test="disabled != null and disabled !=''">#{disabled,jdbcType=TINYINT},</if>
+                <if test="sort != null and sort !=''">#{sort,jdbcType=INTEGER},</if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductTestInspectionItems">
         update plt_product_test_inspection_items
         <set>
-                <if test="proId != null">
+                <if test="proId != null and proId !=''">
                     pro_id = #{proId,jdbcType=BIGINT},
                 </if>
-                <if test="item != null">
+                <if test="item != null and item !=''">
                     item = #{item,jdbcType=VARCHAR},
                 </if>
-                <if test="deleted != null">
+                <if test="deleted != null and deleted !=''">
                     deleted = #{deleted,jdbcType=TINYINT},
                 </if>
-                <if test="disabled != null">
+                <if test="disabled != null and disabled !=''">
                     disabled = #{disabled,jdbcType=TINYINT},
                 </if>
-                <if test="sort != null">
+                <if test="sort != null and sort !=''">
                     sort = #{sort,jdbcType=INTEGER},
                 </if>
         </set>

--
Gitblit v1.8.0