From ea9a04fe8ae638765e174a382c5df419aa63d42e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 23 四月 2024 14:22:27 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pms-SV
---
pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 insertions(+), 3 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 eacb14e..b722404 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
@@ -8,23 +8,28 @@
<result column="name" property="name" />
<result column="disabled" property="disabled" />
<result column="deleted" property="deleted" />
+ <result column="create_dt" property="createDt" />
</resultMap>
<resultMap id="partResultMap" type="com.dy.pmsGlobal.pojoBa.BaRole">
<result column="id" property="id" />
<result column="name" property="name" />
</resultMap>
+ <resultMap id="someResultMap" extends="partResultMap" type="com.dy.pmsGlobal.pojoBa.BaRole">
+ <collection property="priIds" ofType="java.lang.Integer" fetchType="eager" column="{roleId=id}" select="com.dy.pmsGlobal.daoBa.BaPrivilegeMapper.selectPrivilegeByRoleId" />
+ </resultMap>
+
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, `name`, disabled, deleted
+ id, `name`, disabled, deleted,create_dt
</sql>
<sql id="Part_Column_List">
<!--@mbg.generated-->
- id, `name`, disabled
+ id, `name`, disabled,create_dt
</sql>
- <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="someResultMap">
<!--@mbg.generated-->
select
<include refid="Base_Column_List" />
@@ -111,4 +116,43 @@
deleted = #{deleted}
where id = #{id}
</update>
+
+ <delete id="deleteLogicById" parameterType="java.lang.Long">
+ update ba_role set deleted = 1
+ where id = #{id}
+ </delete>
+
+ <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
+ <trim prefix="and" suffixOverrides="and">
+ <if test="name != null and name != ''">
+ r.name like concat('%', #{name}, '%') and
+ </if>
+ </trim>
+ </select>
+
+ <select id="selectSome" resultMap="someResultMap">
+ select
+ <include refid="Part_Column_List" >
+ <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
+ <trim prefix="and" suffixOverrides="and">
+ <if test="name != null and name != ''">
+ r.name like concat('%', #{name}, '%') and
+ </if>
+ </trim>
+ order by id DESC
+ <trim prefix="limit " >
+ <if test="start != null and count != null">
+ #{start}, #{count}
+ </if>
+ </trim>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0