From ecef3df4890be54c1da2a8a4fc1c8c1f50f1c263 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 07 四月 2025 15:41:47 +0800
Subject: [PATCH] 式样代码管理

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRolePermissionsMapper.xml |   61 ++++++++++++++++++++++++++++--
 1 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRolePermissionsMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRolePermissionsMapper.xml
index 9fa4b68..e7fbfb0 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRolePermissionsMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRolePermissionsMapper.xml
@@ -6,12 +6,14 @@
     <!--@Table ba_role_permissions-->
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="roleId" jdbcType="BIGINT" property="roleid" />
-    <result column="permissions" jdbcType="VARCHAR" property="permissions" />
+<!--    <result column="permissions" jdbcType="VARCHAR" property="permissions" />-->
+    <result column="permissions" property="permissions" jdbcType="JAVA_OBJECT" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     id, roleId, permissions
   </sql>
+
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     <!--@mbg.generated-->
     select 
@@ -34,7 +36,7 @@
     <!--@mbg.generated-->
     insert into ba_role_permissions (id, roleId, permissions
       )
-    values (#{id,jdbcType=BIGINT}, #{roleid,jdbcType=BIGINT}, #{permissions,jdbcType=VARCHAR}
+    values (#{id,jdbcType=BIGINT}, #{roleid,jdbcType=BIGINT}, #{permissions,jdbcType= JAVA_OBJECT, typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler}
       )
   </insert>
 
@@ -60,7 +62,7 @@
         #{roleid,jdbcType=BIGINT},
       </if>
       <if test="permissions != null">
-        #{permissions,jdbcType=VARCHAR},
+        #{permissions,jdbcType=JAVA_OBJECT,typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler},
       </if>
     </trim>
   </insert>
@@ -72,7 +74,7 @@
         roleId = #{roleid,jdbcType=BIGINT},
       </if>
       <if test="permissions != null">
-        permissions = #{permissions,jdbcType=VARCHAR},
+        permissions = #{permissions,jdbcType=JAVA_OBJECT,typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler},
       </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
@@ -81,7 +83,56 @@
     <!--@mbg.generated-->
     update ba_role_permissions
     set roleId = #{roleid,jdbcType=BIGINT},
-      permissions = #{permissions,jdbcType=VARCHAR}
+      permissions = #{permissions,jdbcType=JAVA_OBJECT,typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler}
     where id = #{id,jdbcType=BIGINT}
   </update>
+
+  <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇瑙掕壊璁板綍鏁�-->
+  <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 = "roleName != null and roleName !=''">
+        AND role.name LIKE CONCAT('%',#{roleName},'%')
+      </if>
+    </where>
+  </select>
+
+  <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇瑙掕壊璁板綍-->
+  <select id="getRoles" resultType="com.dy.pipIrrGlobal.voBa.VoRole">
+    SELECT
+
+      CAST(role.id AS char) AS roleId,
+      role.name AS roleName,
+      per.id AS perId,
+      (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 = "roleName != null and roleName !=''">
+        AND role.name LIKE CONCAT('%',#{roleName},'%')
+      </if>
+    </where>
+    ORDER BY role.operate_dt DESC
+    <trim prefix="limit " >
+      <if test="start != null and count != null">
+        #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+      </if>
+    </trim>
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0