修改历史记录

ruoyi-equity/src/main/java/com/ruoyi/equity/controller/EquityChangeRecordController.java

@@ -2,12 +2,14 @@ package com.ruoyi.equity.controller;
 
 import java.util.List;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.extension.api.R;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.equity.domain.vo.EquityChangeRecordVO;
 import com.ruoyi.equity.domain.vo.ShareholderInfoVO;
+import com.ruoyi.system.mapper.SysRoleMapper;
 import com.ruoyi.system.service.ISysRoleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -44,6 +46,9 @@ public class EquityChangeRecordController extends BaseController
     @Autowired
     private ISysRoleService sysRoleService;
 
+    @Autowired
+    private SysRoleMapper sysRoleMapper;
+
     /**
      * 查询股权变更记录列表
      */
@@ -54,8 +59,11 @@ public class EquityChangeRecordController extends BaseController
     {
         //获取id 查看是不是管理员 是管理员，全查， 不是管理员
         Long userId = SecurityUtils.getUserId();
-        List<SysRole> roles = sysRoleService.selectRolesByUserId(userId);
-        Long roleId = roles.get(0).getRoleId();
+        List<Long> roleIds = sysRoleMapper.getRoleByUserId(userId);
+        if (CollectionUtil.isEmpty(roleIds)){
+            throw new RuntimeException("当前用户暂未分配角色，无法查看历史");
+        }
+        Long roleId = roleIds.get(0);
         startPage();
         List<EquityChangeRecordVO> list = equityChangeRecordService.selectEquityChangeRecordList(equityChangeRecord,roleId,userId);
         return getDataTable(list);

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java

@@ -2,6 +2,7 @@ package com.ruoyi.system.mapper;
 
 import java.util.List;
 import com.ruoyi.common.core.domain.entity.SysRole;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 角色表 数据层
@@ -104,4 +105,6 @@ public interface SysRoleMapper
      * @return 结果
      */
     public int deleteRoleByIds(Long[] roleIds);
+
+    List<Long> getRoleByUserId(@Param("userId") Long userId);
 }

ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -92,8 +92,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<include refid="selectRoleVo"/>
 		 where r.role_key=#{roleKey} and r.del_flag = '0' limit 1
 	</select>
-	
- 	<insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId">
+    <select id="getRoleByUserId" resultType="java.lang.Long">
+		SELECT role_id FROM sys_user_role WHERE user_id = #{userId}
+	</select>
+
+    <insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId">
  		insert into sys_role(
  			<if test="roleId != null and roleId != 0">role_id,</if>
  			<if test="roleName != null and roleName != ''">role_name,</if>