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/BaRoleMapper.xml |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
index d3fb7b3..f8e99c5 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
@@ -67,7 +67,7 @@
       <if test="id != null">
         id,
       </if>
-      <if test="name != null">
+      <if test="name != null and name !=''">
         `name`,
       </if>
       <if test="disabled != null">
@@ -81,7 +81,7 @@
       <if test="id != null">
         #{id},
       </if>
-      <if test="name != null">
+      <if test="name != null and name !=''">
         #{name},
       </if>
       <if test="disabled != null">
@@ -96,7 +96,7 @@
     <!--@mbg.generated-->
     update ba_role
     <set>
-      <if test="name != null">
+      <if test="name != null and name !=''">
         `name` = #{name},
       </if>
       <if test="disabled != null">
@@ -117,10 +117,10 @@
     where id = #{id}
   </update>
 
-  <delete id="deleteLogicById" parameterType="java.lang.Long">
+  <update id="deleteLogicById" parameterType="java.lang.Long">
     update ba_role set deleted = 1
     where id = #{id}
-  </delete>
+  </update>
 
   <select id="selectSomeCount" resultType="java.lang.Long">
     select
@@ -132,7 +132,7 @@
       <if test="name != null and name != ''">
         r.name like concat('%', #{name}, '%') and
       </if>
-      <if test="disabled != null and disabled != ''">
+      <if test="disabled != null">
         r.disabled =#{disabled,jdbcType=BOOLEAN} and
       </if>
       <if test="dt != null and dt != ''">
@@ -153,7 +153,7 @@
       <if test="name != null and name != ''">
         r.name like concat('%', #{name}, '%') and
       </if>
-      <if test="disabled != null and disabled != ''">
+      <if test="disabled != null">
         r.disabled =#{disabled,jdbcType=BOOLEAN} and
       </if>
       <if test="dt != null and dt != ''">
@@ -167,4 +167,11 @@
       </if>
     </trim>
   </select>
+  <select id="selectAll" resultType="com.dy.pmsGlobal.pojoBa.BaRole">
+    select
+    <include refid="Base_Column_List" />
+    from ba_role
+    where deleted != 1 and disabled !=1
+  </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0