From 5b207a55bdd10f1516031f629217daac069b64fd Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期五, 30 八月 2024 11:40:31 +0800
Subject: [PATCH] 添加免登录查询所有排班接口;

---
 pms-parent/pms-global/src/main/resources/mapper/PltProductTestInspectionItemsMapper.xml |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 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 f4e0ffc..9fe663e 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltProductTestInspectionItemsMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltProductTestInspectionItemsMapper.xml
@@ -32,11 +32,15 @@
         from plt_product_test_inspection_items t
         where t.deleted!=1
         <trim prefix="and" suffixOverrides="and">
-            <if test="proId != null and proId != ''">
+            <if test="proId != null">
                 t.pro_id=#{proId} and
             </if>
             <if test="item != null  and item != ''">
                 t.item like concat('%', #{item}, '%') and
+            </if>
+            <if test="disabled != null">
+                t.disabled != 1  and
+                <!--FIND_IN_SET(t.disabled, #{disabled}) and-->
             </if>
         </trim>
     </select>
@@ -47,11 +51,14 @@
         from plt_product_test_inspection_items t
         where t.deleted!=1
         <trim prefix="and" suffixOverrides="and">
-            <if test="proId != null and proId != ''">
+            <if test="proId != null">
                 t.pro_id=#{proId} and
             </if>
             <if test="item != null  and item != ''">
                 t.item like concat('%', #{item}, '%') and
+            </if>
+            <if test="disabled != null">
+                t.disabled != 1  and
             </if>
         </trim>
         order by sort desc
@@ -80,7 +87,7 @@
         <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="item != null and item !=''">item,</if>
                 <if test="deleted != null">deleted,</if>
                 <if test="disabled != null">disabled,</if>
                 <if test="sort != null">sort,</if>
@@ -88,7 +95,7 @@
         <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="item != null and item !=''">#{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>
@@ -100,7 +107,7 @@
                 <if test="proId != null">
                     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">

--
Gitblit v1.8.0