diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/NewsFeed/controller/NewsFeedController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/NewsFeed/controller/NewsFeedController.java index 8941bf7f..5141223e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/NewsFeed/controller/NewsFeedController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/NewsFeed/controller/NewsFeedController.java @@ -56,7 +56,9 @@ public class NewsFeedController extends BaseController { queryWrapper.eq(StringUtils.isNotEmpty(page.getStandardId()),"STANDARD_ID",page.getStandardId()); queryWrapper.eq(StringUtils.isNotEmpty(page.getStandardName()),"STANDARD_NAME",page.getStandardName()); queryWrapper.eq("MESSAGE_TYPE",page.getMessageType()); - queryWrapper.in("TEXT_STATE",list); + if(StringUtils.isNotBlank(page.getMessageType())){ + queryWrapper.in("TEXT_STATE",list); + } queryWrapper.orderByDesc("RENEW_TIME"); IPage newsFeedList = newsFeedService.page(iPage,queryWrapper); return Result.success(newsFeedList);