首页校验-用户关联股东只显示股东

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

@@ -83,7 +83,8 @@ public class ShareholderInfoController extends BaseController
     public AjaxResult getAllShareholder()
     {
         List<ShareholderInfo> list = shareholderInfoService.list(new LambdaQueryWrapper<ShareholderInfo>()
-                .select(ShareholderInfo::getShareholderId,ShareholderInfo::getShareholderName));
+                .select(ShareholderInfo::getShareholderId,ShareholderInfo::getShareholderName)
+                .eq(ShareholderInfo::getNodeType,1));
         return success(list);
     }
 

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

@@ -139,6 +139,7 @@ public class BecomeShareholderRecordServiceImpl implements IBecomeShareholderRec
                 record.setChangeShareholderId(info.getShareholderId());
                 record.setChangeBeforeRatio(info.getShareholdingRatio());
                 record.setChangeDate(DateUtils.getNowDate());
+                record.setCreateTime(DateUtils.getNowDate());
                 //计算变更后的值
                 BigDecimal afterRatio = info.getShareholdingRatio().multiply(new BigDecimal(1).subtract(divideRatio));
                 //通知所有关联此股东的用户
@@ -149,6 +150,7 @@ public class BecomeShareholderRecordServiceImpl implements IBecomeShareholderRec
                         message.setMsgTime(DateUtils.getNowDate());
                         message.setUserId(userId);
                         message.setMsgContent("股东【" + info.getShareholderName() + "】的股份占比已由【" + info.getShareholdingRatio().setScale(2, RoundingMode.HALF_UP) + "】降低为【" + afterRatio.setScale(2, RoundingMode.HALF_UP) + "】");
+                        message.setCreateTime(DateUtils.getNowDate());
                         messages.add(message);
                     }
                 }

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

@@ -126,6 +126,7 @@ public class EquityTransferRecordServiceImpl extends ServiceImpl<EquityTransferR
                 message.setMsgTime(DateUtils.getNowDate());
                 message.setUserId(userId);
                 message.setMsgContent("股东【" + seller.getShareholderName() + "】的股份占比已由【" + seller.getShareholdingRatio().setScale(2, RoundingMode.HALF_UP) + "】降低为【" + sellerAfterRatio.setScale(2, RoundingMode.HALF_UP) + "】");
+                message.setCreateTime(DateUtils.getNowDate());
                 messages.add(message);
             }
         }
@@ -136,6 +137,7 @@ public class EquityTransferRecordServiceImpl extends ServiceImpl<EquityTransferR
                 message.setMsgTime(DateUtils.getNowDate());
                 message.setUserId(userId);
                 message.setMsgContent("股东【" + buyer.getShareholderName() + "】的股份占比已由【" + buyer.getShareholdingRatio().setScale(2, RoundingMode.HALF_UP) + "】提高为【" + buyerAfterRatio.setScale(2, RoundingMode.HALF_UP) + "】");
+                message.setCreateTime(DateUtils.getNowDate());
                 messages.add(message);
             }
         }
@@ -150,6 +152,7 @@ public class EquityTransferRecordServiceImpl extends ServiceImpl<EquityTransferR
                 .changeAfterRatio(sellerAfterRatio)
                 .changeDate(DateUtils.getNowDate())
                 .build();
+        record1.setCreateTime(DateUtils.getNowDate());
         records.add(record1);
         EquityChangeRecord record2 = EquityChangeRecord.builder()
                 .equityChangeType("2")
@@ -159,6 +162,7 @@ public class EquityTransferRecordServiceImpl extends ServiceImpl<EquityTransferR
                 .changeAfterRatio(buyerAfterRatio)
                 .changeDate(DateUtils.getNowDate())
                 .build();
+        record2.setCreateTime(DateUtils.getNowDate());
         records.add(record2);
         equityChangeRecordService.saveBatch(records);
 

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

@@ -153,6 +153,9 @@ 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());

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

@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select shareholder_id, parent_id, ancestors, shareholder_name, shareholder_type, shareholding_ratio, controlled_company as thecompany, company_valuation, is_subject, node_type, create_by, create_time, update_by, update_time, remark ,
         (select shareholder_name from e_shareholder_info where thecompany = shareholder_id) as companyName
          from e_shareholder_info
-        where (is_subject = 1 or node_type = 1)
+        where (is_subject = 1 or node_type in (1, 0))
             <if test="shareholderName != null  and shareholderName != ''"> and shareholder_name like concat('%', #{shareholderName}, '%')</if>
             <if test="shareholderType != null  and shareholderType != ''"> and shareholder_type = #{shareholderType}</if>
             <if test="controlledCompany != null "> and controlled_company = #{controlledCompany}</if>