From 732b40515d87a1780a5986227513d507076ca5eb Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 27 八月 2024 13:56:10 +0800
Subject: [PATCH] fix order search

---
 pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml |   51 ++++++++++++++++++++++++++++++++-------------------
 1 files changed, 32 insertions(+), 19 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 8404420..efe0700 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
@@ -42,7 +42,7 @@
     from ba_role r
     inner join ba_user_role ur on r.id = ur.role_id
     where r.deleted != 1
-    <if test="userId != null">
+    <if test="userId != null and userId !=''">
       and ur.user_id = #{userId}
     </if>
   </select>
@@ -64,30 +64,30 @@
     <!--@mbg.generated-->
     insert into ba_role
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
+      <if test="id != null and id !=''">
         id,
       </if>
-      <if test="name != null">
+      <if test="name != null and name !=''">
         `name`,
       </if>
-      <if test="disabled != null">
+      <if test="disabled != null and disabled !=''">
         disabled,
       </if>
-      <if test="deleted != null">
+      <if test="deleted != null and deleted !=''">
         deleted,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
+      <if test="id != null and id !=''">
         #{id},
       </if>
-      <if test="name != null">
+      <if test="name != null and name !=''">
         #{name},
       </if>
-      <if test="disabled != null">
+      <if test="disabled != null and disabled !=''">
         #{disabled},
       </if>
-      <if test="deleted != null">
+      <if test="deleted != null and deleted !=''">
         #{deleted},
       </if>
     </trim>
@@ -96,13 +96,13 @@
     <!--@mbg.generated-->
     update ba_role
     <set>
-      <if test="name != null">
+      <if test="name != null and name !=''">
         `name` = #{name},
       </if>
-      <if test="disabled != null">
+      <if test="disabled != null and disabled !=''">
         disabled = #{disabled},
       </if>
-      <if test="deleted != null">
+      <if test="deleted != null and deleted !=''">
         deleted = #{deleted},
       </if>
     </set>
@@ -117,20 +117,26 @@
     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
     count(*)
     from ba_role r
-    inner join (select DISTINCT role_id from ba_role_privilege) rp on r.id=rp.role_id
-    where r.disabled!=1 and r.deleted!=1
+    left join (select DISTINCT role_id from ba_role_privilege) rp on r.id=rp.role_id
+    where  r.deleted!=1
     <trim prefix="and" suffixOverrides="and">
       <if test="name != null and name != ''">
         r.name like concat('%', #{name}, '%') and
+      </if>
+      <if test="disabled != null and disabled != ''">
+        r.disabled =#{disabled,jdbcType=BOOLEAN} and
+      </if>
+      <if test="dt != null and dt != ''">
+        DATE_FORMAT(r.dt, '%Y-%m-%d') = #{dt,jdbcType=TIMESTAMP}
       </if>
     </trim>
   </select>
@@ -141,8 +147,8 @@
       <property name="alias" value="r"/>
     </include>
     from ba_role r
-    inner join (select DISTINCT role_id from ba_role_privilege) rp on r.id=rp.role_id
-    where r.disabled!=1 and r.deleted!=1
+    left join (select DISTINCT role_id from ba_role_privilege) rp on r.id=rp.role_id
+    where r.deleted!=1
     <trim prefix="and" suffixOverrides="and">
       <if test="name != null and name != ''">
         r.name like concat('%', #{name}, '%') and
@@ -151,7 +157,7 @@
         r.disabled =#{disabled,jdbcType=BOOLEAN} and
       </if>
       <if test="dt != null and dt != ''">
-        DATE_FORMAT(r.dt, '%Y-%m-%d') = #{dt,jdbcType=TIMESTAMP} and
+        DATE_FORMAT(r.dt, '%Y-%m-%d') = #{dt,jdbcType=TIMESTAMP}
       </if>
     </trim>
     order by id DESC
@@ -161,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