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 { * @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 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 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 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