From 62a7f3228c94db41bf57858a6549eb0db033bf1e Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 29 五月 2024 11:44:17 +0800
Subject: [PATCH] 2024-05-29 朱宝民
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml | 140 ++++++++++++++++++++++++++++++----------------
1 files changed, 90 insertions(+), 50 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 da62340..12c8b3a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
@@ -1,15 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dy.pipIrrGlobal.daoBa.BaRoleMapper">
+<!-- <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaRole">-->
+<!-- <!–@mbg.generated–>-->
+<!-- <!–@Table ba_role–>-->
+<!-- <id column="id" jdbcType="BIGINT" property="id" />-->
+<!-- <result column="name" jdbcType="VARCHAR" property="name" />-->
+<!-- <result column="operator" jdbcType="BIGINT" property="operator" />-->
+<!-- <result column="operate_dt" jdbcType="TIMESTAMP" property="operateDt" />-->
+<!-- <result column="deleted" jdbcType="TINYINT" property="deleted" />-->
+<!-- </resultMap>-->
+
<resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaRole">
- <!--@mbg.generated-->
- <!--@Table ba_role-->
- <id column="id" jdbcType="BIGINT" property="id" />
+ <result column="id" jdbcType="BIGINT" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="operator" jdbcType="BIGINT" property="operator" />
<result column="operate_dt" jdbcType="TIMESTAMP" property="operateDt" />
- <result column="deleted" jdbcType="TINYINT" property="deleted" />
+ <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Deleted"/>
</resultMap>
+
+ <resultMap id="partResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaRole">
+ <result column="id" jdbcType="BIGINT" property="id" />
+ <result column="name" jdbcType="VARCHAR" property="name" />
+ <result column="operator" jdbcType="BIGINT" property="operator" />
+ <result column="operate_dt" jdbcType="TIMESTAMP" property="operateDt" />
+ </resultMap>
+
+<!-- <resultMap id="someResultMap" extends="partResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaRole">-->
+<!-- <collection property="priviList" fetchType="eager" column="{roleId=id}" select="com.dy.pipIrrGlobal.daoBa.BaPrivilegeMapper.selectPrivilegeByRoleId" />-->
+<!-- </resultMap>-->
+
+ <sql id="part_Column_List">
+ id, name, operator, operate_dt, deleted
+ </sql>
+
+ <select id="selectByUserId" resultMap="partResultMap">
+ select <include refid="part_Column_List" />
+ from ba_role r
+ inner join ba_user_role ur on r.id = ur.roleId
+ where r.deleted != 1
+ <if test="userId != null">
+ and ur.userId = #{userId,jdbcType=BIGINT}
+ </if>
+ </select>
+
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, `name`, `operator`, operate_dt, deleted
@@ -21,6 +55,7 @@
from ba_role
where id = #{id,jdbcType=BIGINT}
</select>
+
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--@mbg.generated-->
delete from ba_role
@@ -110,55 +145,60 @@
WHERE name = #{roleName}
</select>
- <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇瑙掕壊璁板綍鏁�-->
- <select id="getRecordCount" resultType="java.lang.Long">
- SELECT
- COUNT(*) AS recordCount
- FROM ba_role role
- LEFT JOIN ba_role_permissions per ON per.roleId = role.id
- <where>
- AND role.deleted = 0
+<!-- <!–鏍规嵁鎸囧畾鏉′欢鑾峰彇瑙掕壊璁板綍鏁�–>-->
+<!-- <select id="getRecordCount" resultType="java.lang.Long">-->
+<!-- SELECT-->
+<!-- COUNT(*) AS recordCount-->
+<!-- FROM ba_role role-->
+<!-- LEFT JOIN ba_role_permissions per ON per.roleId = role.id-->
+<!-- <where>-->
+<!-- AND role.deleted = 0-->
- <if test = "roleId != null and roleId > 0">
- AND role.id = ${roleId}
- </if>
+<!-- <if test = "roleId != null and roleId > 0">-->
+<!-- AND role.id = ${roleId}-->
+<!-- </if>-->
- <if test = "roleName != null and roleName !=''">
- AND role.name LIKE CONCAT('%',#{roleName},'%')
- </if>
- </where>
- </select>
+<!-- <if test = "roleName != null and roleName !=''">-->
+<!-- AND role.name LIKE CONCAT('%',#{roleName},'%')-->
+<!-- </if>-->
+<!-- </where>-->
+<!-- </select>-->
- <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇瑙掕壊璁板綍-->
- <select id="getRoles" resultType="com.dy.pipIrrGlobal.voBa.VoRole">
- SELECT
- (@i:=@i+1) AS id,
- t.* FROM
- (
- SELECT
- role.id AS roleId,
- role.name AS roleName,
- per.permissions,
- (SELECT `name` FROM ba_user WHERE id = role.operator) AS operator,
- role.operate_dt AS operateDt
- FROM ba_role role
- LEFT JOIN ba_role_permissions per ON per.roleId = role.id
- <where>
- AND role.deleted = 0
+<!-- <!–鏍规嵁鎸囧畾鏉′欢鑾峰彇瑙掕壊璁板綍–>-->
+<!-- <select id="getRoles" resultType="com.dy.pipIrrGlobal.voBa.VoRole">-->
+<!-- SELECT-->
+<!-- (@i:=@i+1) AS id,-->
+<!-- t.* FROM-->
+<!-- (-->
+<!-- SELECT-->
+<!-- role.id AS roleId,-->
+<!-- role.name AS roleName,-->
+<!-- per.permissions,-->
+<!-- (SELECT `name` FROM ba_user WHERE id = role.operator) AS operator,-->
+<!-- role.operate_dt AS operateDt-->
+<!-- FROM ba_role role-->
+<!-- LEFT JOIN ba_role_permissions per ON per.roleId = role.id-->
+<!-- <where>-->
+<!-- AND role.deleted = 0-->
- <if test = "roleId != null and roleId > 0">
- AND role.id = ${roleId}
- </if>
+<!-- <if test = "roleId != null and roleId > 0">-->
+<!-- AND role.id = ${roleId}-->
+<!-- </if>-->
- <if test = "roleName != null and roleName !=''">
- AND role.name LIKE CONCAT('%',#{roleName},'%')
- </if>
- </where>
- ORDER BY role.operate_dt DESC
- <if test="pageCurr != null and pageSize != null">
- LIMIT ${pageCurr}, ${pageSize}
- </if>
- ) t
- , (SELECT @i:=0) AS itable
- </select>
+<!-- <if test = "roleName != null and roleName !=''">-->
+<!-- AND role.name LIKE CONCAT('%',#{roleName},'%')-->
+<!-- </if>-->
+<!-- </where>-->
+<!-- ORDER BY role.operate_dt DESC-->
+<!-- <if test="pageCurr != null and pageSize != null">-->
+<!-- LIMIT ${pageCurr}, ${pageSize}-->
+<!-- </if>-->
+<!-- ) t-->
+<!-- , (SELECT @i:=0) AS itable-->
+<!-- </select>-->
+
+ <!--鏍规嵁roleId閫昏緫鍒犻櫎瑙掕壊瀵硅薄-->
+ <update id="deleteRoleById">
+ UPDATE ba_role SET deleted = 1 WHERE id = ${roleId}
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0