From 88c967d9af10a4557a037c47b6e8e4cd75f23932 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 09 一月 2024 15:23:04 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
index faca4a6..79c6dfa 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
@@ -22,7 +22,7 @@
</sql>
<sql id="part_Column_List">
- id, name
+ id, name, deleted
</sql>
<select id="selectAll" resultMap="BaseResultMap">
@@ -47,7 +47,7 @@
count(*)
from ba_role where deleted!=1
<trim prefix="and" suffixOverrides="and">
- <if test="name != null">
+ <if test="name != null and name != ''">
name like concat('%', #{name}, '%')
</if>
</trim>
@@ -58,19 +58,19 @@
<include refid="part_Column_List" />
from ba_role where deleted!=1
<trim prefix="and" suffixOverrides="and">
- <if test="name != null">
+ <if test="name != null and name != ''">
name like concat('%', #{name}, '%')
</if>
</trim>
order by id DESC
<trim prefix="limit " >
<if test="start != null and count != null">
- #{start,jdbcType=INTEGER}, #{count,jdbcType=INTEGER}
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
</if>
</trim>
</select>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRole">
+ <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRole">
insert into ba_role (<include refid="Base_Column_List" />)
values (#{id,jdbcType=BIGINT},
#{name,jdbcType=VARCHAR},
--
Gitblit v1.8.0