diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/CommonArticleListFormDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/CommonArticleListFormDTO.java index ee7b04d830..c7addb73e8 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/CommonArticleListFormDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/CommonArticleListFormDTO.java @@ -57,10 +57,6 @@ public class CommonArticleListFormDTO implements Serializable { private Integer pageNo; @NotNull(message = "pageSize不能为空", groups = YanTaiDingShowGroup.class) private Integer pageSize; - - /** - * 标签名称(高级配置里的参数) - * */ - @NotBlank(message = "标签名称不能为空",groups = YanTaiDingShowGroup.class) + @NotBlank(message = "tagId不能为空",groups = YanTaiDingShowGroup.class) private String tagId; } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java index 11d557e531..77ef7f4361 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java @@ -342,7 +342,8 @@ public class ArticleController { return new Result>().ok(articleService.pageArticleListByTagName(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getGridId(), - formDTO.getTagName(),formDTO.getTagId())); + formDTO.getTagName(), + formDTO.getTagId())); } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java index 96adf89bbe..d1964ece10 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java @@ -89,7 +89,7 @@ public class TagController { */ @PostMapping("page-list") public Result> pageList(@LoginUser TokenDto tokenDto,@RequestBody TagCustomerPageFormDTO formDTO){ - tokenDto.setCustomerId(formDTO.getCustomerId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); ValidatorUtils.validateEntity(formDTO,TagCustomerPageFormDTO.PageUserInternalGroup.class,TagCustomerPageFormDTO.PageUserShowGroup.class); return new Result>().ok(tagCustomerService.page(formDTO)); } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java index a9e3f6c953..f51705afdd 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java @@ -2020,7 +2020,8 @@ public class ArticleServiceImpl extends BaseServiceImpl pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal()); } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml index b400ddd7a2..04b8d0d712 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml @@ -534,8 +534,8 @@ WHERE art.DEL_FLAG = '0' AND art.CUSTOMER_ID = #{customerId} - - AND t.TAG_ID = #{tagId} + + AND t.TAG_NAME LIKE concat ( '%', #{tagName}, '%' ) and apr.GRID_ID=#{gridId} @@ -543,8 +543,8 @@ AND art.org_id_path like concat('%',#{agencyId},'%') - - AND t.TAG_NAME LIKE concat ( '%', #{tagName}, '%' ) + + AND t.tag_id =#{tagId} ORDER BY art.PUBLISH_DATE DESC,