From 46f0777d5f93bf316821894552f8eaabafbd32f1 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 09 十一月 2023 14:50:25 +0800
Subject: [PATCH] 完善行政区划功能

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml |   28 ++++++++++++++++++++++++----
 1 files changed, 24 insertions(+), 4 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 e722f57..29d8fe7 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
@@ -1,24 +1,44 @@
 <?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-->
     <result column="id" jdbcType="BIGINT" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
-    <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>
-  <select id="select" resultMap="BaseResultMap">
-    select *
+
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, name, deleted
+  </sql>
+
+  <select id="selectAll" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
     from ba_role
   </select>
+
+  <select id="selectByUserId" resultMap="BaseResultMap">
+    select <include refid="Base_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>
+
   <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRole">
     <!--@mbg.generated-->
     insert into ba_role (id, `name`, deleted
       )
-    values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{deleted,jdbcType=TINYINT}
+    values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{deleted, typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}
       )
   </insert>
+
   <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRole">
     <!--@mbg.generated-->
     insert into ba_role

--
Gitblit v1.8.0