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/PrProductionProcessMapper.xml |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml
index 0386a6a..78e5bed 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml
@@ -78,22 +78,22 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
                 <if test="id != null">id,</if>
                 <if test="proId != null">pro_id,</if>
-                <if test="name != null">name,</if>
-                <if test="creator != null">creator,</if>
-                <if test="dt != null">dt,</if>
+                <if test="name != null and name !=''">name,</if>
+                <if test="creator != null and creator !=''">creator,</if>
+                <if test="dt != null and dt !=''">dt,</if>
                 <if test="disabled != null">disabled,</if>
                 <if test="deleted != null">deleted,</if>
-                <if test="remark != null">remark,</if>
+                <if test="remark != null and remark !=''">remark,</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="name != null">#{name,jdbcType=VARCHAR},</if>
-                <if test="creator != null">#{creator,jdbcType=VARCHAR},</if>
-                <if test="dt != null">#{dt,jdbcType=TIMESTAMP},</if>
+                <if test="name != null and name !=''">#{name,jdbcType=VARCHAR},</if>
+                <if test="creator != null and creator !=''">#{creator,jdbcType=VARCHAR},</if>
+                <if test="dt != null and dt !=''">#{dt,jdbcType=TIMESTAMP},</if>
                 <if test="disabled != null">#{disabled,jdbcType=TINYINT},</if>
                 <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
-                <if test="remark != null">#{remark,jdbcType=VARCHAR},</if>
+                <if test="remark != null and remark !=''">#{remark,jdbcType=VARCHAR},</if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPr.PrProductionProcess">
@@ -102,13 +102,13 @@
                 <if test="proId != null">
                     pro_id = #{proId,jdbcType=BIGINT},
                 </if>
-                <if test="name != null">
+                <if test="name != null and name !=''">
                     name = #{name,jdbcType=VARCHAR},
                 </if>
-                <if test="creator != null">
+                <if test="creator != null and creator !=''">
                     creator = #{creator,jdbcType=VARCHAR},
                 </if>
-                <if test="dt != null">
+                <if test="dt != null and dt !=''">
                     dt = #{dt,jdbcType=TIMESTAMP},
                 </if>
                 <if test="disabled != null">
@@ -117,7 +117,7 @@
                 <if test="deleted != null">
                     deleted = #{deleted,jdbcType=TINYINT},
                 </if>
-                <if test="remark != null">
+                <if test="remark != null and remark !=''">
                     remark = #{remark,jdbcType=VARCHAR},
                 </if>
         </set>
@@ -132,7 +132,7 @@
             <if test="proId != null">
                 pro_id = #{proId,jdbcType=BIGINT} and
             </if>
-<!--            <if test="name != null">-->
+<!--            <if test="name != null and name !=''">-->
 <!--                name = #{name,jdbcType=VARCHAR} and-->
 <!--            </if>-->
         </trim>
@@ -151,12 +151,12 @@
             <if test="proId != null">
                 pro_id = #{proId,jdbcType=BIGINT} and
             </if>
-            <!--            <if test="name != null">-->
+            <!--            <if test="name != null and name !=''">-->
             <!--                name = #{name,jdbcType=VARCHAR} and-->
             <!--            </if>-->
         </trim>
     </select>
-    <select id="queryAll" resultType="map">
+    <select id="queryAll" resultType="java.util.HashMap">
         select
             CAST(id AS CHAR) AS id,name
         from pr_production_process

--
Gitblit v1.8.0