From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change

---
 src/main/java/com/nanometer/smartlab/dao/BaseRoleDao.xml |   38 ++++++++++++++++++++++++++++++++++----
 1 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/dao/BaseRoleDao.xml b/src/main/java/com/nanometer/smartlab/dao/BaseRoleDao.xml
index 872106e..ee04672 100644
--- a/src/main/java/com/nanometer/smartlab/dao/BaseRoleDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/BaseRoleDao.xml
@@ -5,6 +5,8 @@
     <id property="id" column="id"/>
     <result property="name" column="name"></result>
     <result property="memo" column="memo"></result>
+    <result property="userPermission" column="user_permission"></result>
+    <result property="btnPermission" column="btn_permission"></result>
     <result property="createTime" column="create_time"></result>
     <result property="updateTime" column="update_time"></result>
     <result property="validFlag" column="valid_flag" typeHandler="com.nanometer.smartlab.entity.handler.ValidFlagHandler"></result>
@@ -22,7 +24,7 @@
     </if>
   </sql>
 
-  <select id="getBaseRole" parameterType="java.lang.String"  resultMap="BaseRole" >
+  <select id="getBaseRole"  resultMap="BaseRole" >
     select * from base_role
     where id = #{id} and valid_flag = 1
   </select>
@@ -41,10 +43,28 @@
     where valid_flag = 1
     <include refid="queryWhereSql"/>
   </select>
+  <select id="getBaseRoleByUser" resultMap="BaseRole">
+    SELECT br.* FROM base_role br
+    LEFT JOIN sys_user su on su.role_id = br.id
+    where su.id=#{0}
+    and br.valid_flag = 1
+  </select>
 
-  <insert id="insertBaseRole" parameterType="com.nanometer.smartlab.entity.BaseRole">
-    insert into base_role(id, name, memo, valid_flag, create_time, update_time)
-    values (#{id}, #{name}, #{memo}, 1, now(), now())
+  <insert id="insertBaseRole" parameterType="com.nanometer.smartlab.entity.BaseRole" useGeneratedKeys = "true" keyProperty = "id">
+    insert into base_role( name, memo, valid_flag, create_time, update_time
+    <if test="btnPermission !=null">
+      ,btn_permission
+    </if>
+    <if test="userPermission !=null">
+      ,user_permission
+    </if>)
+    values (#{name}, #{memo}, 1, now(), now()
+    <if test="btnPermission !=null">
+      ,#{btnPermission}
+    </if>
+    <if test="userPermission !=null">
+      ,#{userPermission}
+    </if>)
   </insert>
 
   <update id="updateBaseRole" parameterType="com.nanometer.smartlab.entity.BaseRole">
@@ -52,6 +72,16 @@
     where id=#{id}
   </update>
 
+  <update id="updateBaseRoleInfo" parameterType="com.nanometer.smartlab.entity.BaseRole">
+    update base_role
+    <set>
+      <if test="btnPermission != null"> btn_permission=#{btnPermission},</if>
+      <if test="userPermission != null"> user_permission=#{userPermission},</if>
+      update_time=now()
+    </set>
+
+    where id=#{id}
+  </update>
   <update id="deleteBaseRoles" parameterType="java.util.List">
     update base_role set valid_flag=0, update_time=now()
     where id in

--
Gitblit v1.9.2