首页权限

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

@@ -149,21 +149,18 @@ public class ShareholderInfoServiceImpl extends ServiceImpl<ShareholderInfoMappe
         //获取登录用户所绑定的股东信息；如果不是股东就抛异常
         Long userId = SecurityUtils.getUserId();
         try {
-            ShareholderInfo shareholderInfo = shareholderInfoMapper.selectShareholderInfoByUserId(userId);
-            if (Objects.isNull(shareholderInfo)){
-                return vo;
-            }
-            Long shareholderId = shareholderInfo.getShareholderId();
-            String[] str = shareholderInfo.getAncestors().split(",");
-            List<Long> ancestors = Arrays.stream(str).map(Long::parseLong).collect(Collectors.toList());
             //获取股东的role_id
             Long shareholderRoleId = shareholderInfoMapper.selectShareholderRoleIdByUserId(userId);
-
-            log.info("当前登录用户所绑定的股东：{}", shareholderInfo.getShareholderName());
-
             List<ShareholderUpPicVO> ups;
             //如果是普通股东，查普通股东自己的
             if (shareholderRoleId == USER_ROLE_ID) {
+                ShareholderInfo shareholderInfo = shareholderInfoMapper.selectShareholderInfoByUserId(userId);
+                if (Objects.isNull(shareholderInfo)){
+                    return vo;
+                }
+                Long shareholderId = shareholderInfo.getShareholderId();
+                String[] str = shareholderInfo.getAncestors().split(",");
+                List<Long> ancestors = Arrays.stream(str).map(Long::parseLong).collect(Collectors.toList());
                 List<ShareholderUpPicVO> oneselfNodes = shareholderInfoMapper.getOneSelfNode(shareholderId, ancestors);
                 ups = ForestNodeMerger2.merge(oneselfNodes);
             } else {

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

@@ -76,7 +76,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where node_type = 1
     </select>
     <select id="selectShareholderInfoByUserId" resultType="com.ruoyi.equity.domain.ShareholderInfo" parameterType="java.lang.Long">
-        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 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 u.user_id = #{userId} ;