diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsNewsFeedController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsNewsFeedController.java index 9783ed52..47cf37e8 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsNewsFeedController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsNewsFeedController.java @@ -3,6 +3,7 @@ package com.jero.modules.laws.standard.controller; import java.util.*; import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.Translation; import com.jero.common.exception.JeroBootException; import com.jero.common.util.MessageUtils; import com.jero.modules.laws.common.constant.ResultCommon; @@ -142,8 +143,10 @@ public class LawsNewsFeedController extends JeroController queryById(@RequestParam(name = "id") String id) { - LawsNewsFeed lawsNewsFeed = lawsNewsFeedService.queryById(id); + @Translation + public Result queryById(@RequestParam(name = "id") String id, + @RequestParam(name = "type") String type) { + LawsNewsFeed lawsNewsFeed = lawsNewsFeedService.queryById(id, type); return Result.OK(lawsNewsFeed); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsNewsFeedMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsNewsFeedMapper.xml index 87b6cc8a..274d413e 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsNewsFeedMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsNewsFeedMapper.xml @@ -32,5 +32,6 @@ AND lnf.dynamic_heading LIKE CONCAT('%', #{param.dynamicHeading}, '%') + ORDER BY create_time DESC \ No newline at end of file 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 5447d2f4..993ffcb8 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 @@ -62,5 +62,5 @@ public interface ILawsNewsFeedService extends IService { * @param id * @return */ - LawsNewsFeed queryById(String id); + LawsNewsFeed queryById(String id, String type); } 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 ac8dde88..cf1cfbaf 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 @@ -208,13 +208,16 @@ public class LawsNewsFeedServiceImpl extends ServiceImpl