新增股权管理变更记录列表

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

@@ -45,8 +45,10 @@ public class EquityChangeRecordController extends BaseController
     public R<List<EquityChangeRecordVO>> list(EquityChangeRecord equityChangeRecord)
     {
         startPage();
+        Long userId = getUserId();
         List<EquityChangeRecordVO> list = equityChangeRecordService.selectEquityChangeRecordList(equityChangeRecord);
         return R.ok(list);
+        //是管理员全查，不是管理员再通过id查
     }
 
     /**

ruoyi-equity/src/main/java/com/ruoyi/equity/mapper/EquityChangeRecordMapper.java

@@ -25,11 +25,11 @@ public interface EquityChangeRecordMapper extends BaseMapper<EquityChangeRecord>
 
     /**
      * 查询股权变更记录列表
-     * 
-     * @param equityChangeRecord 股权变更记录
+     *
+     * @param userId
      * @return 股权变更记录集合
      */
-    public List<EquityChangeRecordVO> selectEquityChangeRecordList(EquityChangeRecord equityChangeRecord);
+    public List<EquityChangeRecordVO> selectEquityChangeRecordList(Long userId);
 
     /**
      * 新增股权变更记录
@@ -63,4 +63,5 @@ public interface EquityChangeRecordMapper extends BaseMapper<EquityChangeRecord>
      */
     public int deleteEquityChangeRecordByEquityChangeIds(Long[] equityChangeIds);
 
+    List<EquityChangeRecordVO> selectEquityChangeRecordByUserId(@Param("userId") Long userId);
 }

ruoyi-equity/src/main/java/com/ruoyi/equity/service/IEquityChangeRecordService.java

@@ -24,7 +24,6 @@ public interface IEquityChangeRecordService extends IService<EquityChangeRecord>
 
     /**
      * 查询股权变更记录列表
-     * 
      * @param equityChangeRecord 股权变更记录
      * @return 股权变更记录集合
      */

ruoyi-equity/src/main/java/com/ruoyi/equity/service/impl/EquityChangeRecordServiceImpl.java

@@ -1,10 +1,17 @@
 package com.ruoyi.equity.service.impl;
 
 import java.util.List;
+import java.util.Set;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.equity.domain.vo.EquityChangeRecordVO;
+import com.ruoyi.equity.mapper.ShareholderInfoMapper;
+import com.ruoyi.equity.service.IEquityTransferRecordService;
+import com.ruoyi.system.service.ISysRoleService;
+import com.ruoyi.system.service.impl.SysRoleServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.equity.mapper.EquityChangeRecordMapper;
@@ -22,6 +29,8 @@ public class EquityChangeRecordServiceImpl extends ServiceImpl<EquityChangeRecor
 {
     @Autowired
     private EquityChangeRecordMapper equityChangeRecordMapper;
+    @Autowired
+    private ISysRoleService sysRoleService;
 
     /**
      * 查询股权变更记录
@@ -37,14 +46,26 @@ public class EquityChangeRecordServiceImpl extends ServiceImpl<EquityChangeRecor
 
     /**
      * 查询股权变更记录列表
-     * 
+     *
+     *
      * @param equityChangeRecord 股权变更记录
      * @return 股权变更记录
      */
     @Override
     public List<EquityChangeRecordVO> selectEquityChangeRecordList(EquityChangeRecord equityChangeRecord)
     {
-        return equityChangeRecordMapper.selectEquityChangeRecordList(equityChangeRecord);
+        //获取id 查看是不是管理员 是管理员，全查， 不是管理员
+        Long userId = SecurityUtils.getUserId();
+        List<SysRole> roles = sysRoleService.selectRolesByUserId(userId);
+        Long roleId = roles.get(0).getRoleId();
+        if (roleId == 102){
+            //是普通股东，就查自己的：
+            return equityChangeRecordMapper.selectEquityChangeRecordByUserId(userId);
+        }else {
+            //是管理员或者更高级管理员 就全查
+            return equityChangeRecordMapper.selectEquityChangeRecordList(userId);
+        }
+
     }
 
     /**

ruoyi-equity/src/main/resources/mapper/equity/EquityChangeRecordMapper.xml

@@ -38,18 +38,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         remark,
         (select shareholder_name from e_shareholder_info where shareid = shareholder_id) as changeShareholderName,
         (select  shareholder_name from e_shareholder_info where compid = shareholder_id) as companyName
-        from e_equity_change_record
-        <where>  
+        from e_equity_change_record ;
+       <!-- <where>
             <if test="equityChangeType != null  and equityChangeType != ''"> and equity_change_type = #{equityChangeType}</if>
             <if test="companyId != null "> and company_id = #{companyId}</if>
             <if test="changeShareholderId != null "> and change_shareholder_id = #{changeShareholderId}</if>
-        </where>
+        </where>-->
     </select>
     
     <select id="selectEquityChangeRecordByEquityChangeId" parameterType="Long" resultMap="EquityChangeRecordResult">
         <include refid="selectEquityChangeRecordVo"/>
         where equity_change_id = #{equityChangeId}
     </select>
+    <select id="selectEquityChangeRecordByUserId" resultType="com.ruoyi.equity.domain.vo.EquityChangeRecordVO">
+        select  r.equity_change_id,
+                r.equity_change_type,
+                r.company_id as compid,
+                r.change_shareholder_id as shareid,
+                r.change_before_ratio,
+                r.change_after_ratio,
+                r.change_date,
+                r.create_by,
+                r.create_time,
+                r.update_by,
+                r.update_time,
+                r.remark,
+                (select shareholder_name from e_shareholder_info where shareid = shareholder_id) as changeShareholderName,
+                (select  shareholder_name from e_shareholder_info where compid = shareholder_id) as companyName
+        from e_equity_change_record r left join sys_user u on r.change_shareholder_id = u.shareholder_id
+        where u.user_id = #{userId};
+    </select>
 
     <insert id="insertEquityChangeRecord" parameterType="EquityChangeRecord" useGeneratedKeys="true" keyProperty="equityChangeId">
         insert into e_equity_change_record

ruoyi-equity/src/main/resources/mapper/equity/ShareholderInfoMapper.xml

@@ -79,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select shareholder.* from e_shareholder_info shareholder left join  sys_user user on user.shareholder_id = shareholder.shareholder_id where user.user_id = #{userId};
     </select>
     <select id="selectShareholderRoleIdByUserId" resultType="java.lang.Long" parameterType="java.lang.Long">
-        select r.role_id from sys_user u left join sys_user_role r on u.user_id = r.user_id where r.user_id = #{userId};
+        select r.role_id from sys_user u left join sys_user_role r on u.user_id = r.user_id where u.user_id = #{userId} ;
     </select>
     <select id="getOneSelfNode" resultType="com.ruoyi.equity.domain.vo.ShareholderUpPicVO">
         select shareholder_id as id,