From 89e7c162b126515f87e2cd4441d102010dd5c778 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Thu, 1 Feb 2024 18:13:09 +0800
Subject: [PATCH] fix:78587

---
 .../laws/standard/service/ILawsNewsFeedService.java        | 6 ++++++
 .../standard/service/impl/LawsNewsFeedServiceImpl.java     | 3 ++-
 .../personal/controller/LawsBrowsingHistoryController.java | 6 ++++++
 .../controller/LawsStandardCollectionController.java       | 7 ++++++-
 .../personal/controller/LawsStandardSharingController.java | 1 +
 5 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsNewsFeedService.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsNewsFeedService.java
index 397b6e6a..77c810b7 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsNewsFeedService.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsNewsFeedService.java
@@ -63,4 +63,10 @@ public interface ILawsNewsFeedService extends IService<LawsNewsFeed> {
 	 * @return
 	 */
     LawsNewsFeed queryById(String id, String type);
+
+	/**
+	 * 是否拥有查看权限
+	 * @param lawsNewsFeed
+	 */
+	void isHaveQueryAuth(LawsNewsFeed lawsNewsFeed);
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java
index 5662d90a..2fbaa991 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java
@@ -204,7 +204,8 @@ public class LawsNewsFeedServiceImpl extends ServiceImpl<LawsNewsFeedMapper, Law
 	 * @Date: 2023/11/27 9:34
 	 * @Description: 是否拥有查看权限
 	 **/
-	private void isHaveQueryAuth(LawsNewsFeed lawsNewsFeed) {
+	@Override
+	public void isHaveQueryAuth(LawsNewsFeed lawsNewsFeed) {
 		String userId = CurrentUserUtil.getId();
 		String roles = CurrentUserUtil.getRoles();
 		// 如果是编辑者，直接返回
diff --git a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsBrowsingHistoryController.java b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsBrowsingHistoryController.java
index b551f384..3ca52033 100644
--- a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsBrowsingHistoryController.java
+++ b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsBrowsingHistoryController.java
@@ -16,6 +16,7 @@ import com.jero.modules.personal.service.ILawsBrowsingHistoryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.apache.shiro.SecurityUtils;
@@ -26,6 +27,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 
@@ -102,6 +104,10 @@ public class LawsBrowsingHistoryController extends JeroController<LawsBrowsingHi
 		 if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){
 			 throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA);
 		 }
+		 List<LawsBrowsingHistory> listLawsBrowsingHistory = lawsBrowsingHistoryService.listByIds(Arrays.asList(map.get("ids").split(",")));
+		 if(CollectionUtils.isEmpty(listLawsBrowsingHistory)){
+			 throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
+		 }
 		 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		 LambdaQueryWrapper<LawsBrowsingHistory> queryLawsBrowsingHistory = new LambdaQueryWrapper<>();
 		 queryLawsBrowsingHistory.ne(LawsBrowsingHistory::getBrowsingUserId,sysUser.getId());
diff --git a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java
index 244061cf..a47b2258 100644
--- a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java
+++ b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java
@@ -33,9 +33,10 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
+import java.util.Objects;
 
 
- /**
+/**
  * @Description: 标准收藏
  * @Author: jero-boot
  * @Date:   2023-09-07
@@ -210,6 +211,10 @@ public class LawsStandardCollectionController extends JeroController<LawsStandar
 		 if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){
 			 throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA);
 		 }
+		 LawsStandardCollection lawsStandardCollection = lawsStandardCollectionService.getById(map.get("id"));
+		 if(Objects.isNull(lawsStandardCollection)){
+			 throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
+		 }
 		 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		 LambdaQueryWrapper<LawsStandardCollection> queryLawsStandardCollection = new LambdaQueryWrapper<>();
 		 queryLawsStandardCollection.eq(LawsStandardCollection::getId,map.get("id"));
diff --git a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java
index a65193f1..9e86f019 100644
--- a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java
+++ b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java
@@ -260,6 +260,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
         String recipientId = lawsStandardSharing.getRecipientId();
         Date date = new Date();
         LawsNewsFeed lawsNewsFeed = lawsNewsFeedService.getById(lawsStandardSharing.getStandardId());
+        lawsNewsFeedService.isHaveQueryAuth(lawsNewsFeed);
         if (0 == lawsNewsFeed.getReleaseStatus()) {
             throw new JeroBootException("未发布的消息不能进行分享");
         }