续期标签展示新增权限控制

dgtis-modules/dgtis-modules-data/src/main/java/com/dgtis/data/mapper/SysUserMapper.java

@@ -1,5 +1,6 @@
 package com.dgtis.data.mapper;
 
+import com.dgtis.system.api.domain.SysRole;
 import com.dgtis.system.api.domain.SysUser;
 import org.apache.ibatis.annotations.Param;
 
@@ -109,4 +110,6 @@ public interface SysUserMapper
      * @return 结果
      */
     public SysUser checkEmailUnique(String email);
+
+    public List<SysRole> selectUserRoles(@Param("userId") Long userId);
 }

dgtis-modules/dgtis-modules-data/src/main/java/com/dgtis/data/service/impl/SysUserServiceImpl.java

@@ -2,12 +2,15 @@ package com.dgtis.data.service.impl;
 
 import com.dgtis.data.mapper.SysUserMapper;
 import com.dgtis.data.service.ISysUserService;
+import com.dgtis.system.api.domain.SysRole;
 import com.dgtis.system.api.domain.SysUser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 用户 业务层处理
  * 
@@ -30,7 +33,10 @@ public class SysUserServiceImpl implements ISysUserService
     @Override
     public SysUser selectUserById(Long userId)
     {
-        return userMapper.selectUserById(userId);
+        SysUser sysUser = userMapper.selectUserById(userId);
+        List<SysRole> sysRoles = userMapper.selectUserRoles(userId);
+        sysUser.setRoles(sysRoles);
+        return sysUser;
     }
 
 }

dgtis-modules/dgtis-modules-data/src/main/resources/mapper/data/SysUserMapper.xml

@@ -35,6 +35,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="leader"   column="leader"      />
 		<result property="status"   column="dept_status" />
 	</resultMap>
+
+    <resultMap id="RoleResult" type="SysRole">
+        <id property="roleId" column="role_id"/>
+        <result property="roleName" column="role_name"/>
+        <result property="roleKey" column="role_key"/>
+        <result property="roleSort" column="role_sort"/>
+        <result property="dataScope" column="data_scope"/>
+        <result property="status" column="status"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
 	
 	<sql id="selectUserVo">
         select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, 
@@ -47,5 +58,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<include refid="selectUserVo"/>
 		where u.user_id = #{userId}
 	</select>
+
+    <select id="selectUserRoles" parameterType="Long" resultMap="RoleResult">
+        select r.*
+        from sys_user u
+                 left join sys_user_role ur on u.user_id = ur.user_id
+                 left join sys_role r on r.role_id = ur.role_id
+        where u.user_id = #{userId}
+    </select>
 	
 </mapper>