diff --git a/src/main/java/com/sqx/modules/announcement/controller/AnnouncementController.java b/src/main/java/com/sqx/modules/announcement/controller/AnnouncementController.java index 41dcd709..aff75d8c 100644 --- a/src/main/java/com/sqx/modules/announcement/controller/AnnouncementController.java +++ b/src/main/java/com/sqx/modules/announcement/controller/AnnouncementController.java @@ -19,8 +19,8 @@ public class AnnouncementController { } @GetMapping("/list") - public Result list(@RequestParam(required = false) String title, @RequestParam(required = false) Integer state, @RequestParam(required = false) Integer id) { - return Result.success().put("data", announcementService.listInfo(title, state, id)); + public Result list(@RequestParam(required = false) String title, @RequestParam(required = false) Integer state, @RequestParam(required = false) Integer id, @RequestParam(required = false) Integer type) { + return Result.success().put("data", announcementService.listInfo(title, state, id, type)); } @PostMapping diff --git a/src/main/java/com/sqx/modules/announcement/service/AnnouncementService.java b/src/main/java/com/sqx/modules/announcement/service/AnnouncementService.java index 6a1180b4..e167593a 100644 --- a/src/main/java/com/sqx/modules/announcement/service/AnnouncementService.java +++ b/src/main/java/com/sqx/modules/announcement/service/AnnouncementService.java @@ -17,6 +17,6 @@ public interface AnnouncementService extends IService { Object updateInfo(UpdateAnnouncementDTO updateAnnouncementDTO); - Object listInfo(String title, Integer state, Integer id); + Object listInfo(String title, Integer state, Integer id, Integer type); } diff --git a/src/main/java/com/sqx/modules/announcement/service/impl/AnnouncementServiceImpl.java b/src/main/java/com/sqx/modules/announcement/service/impl/AnnouncementServiceImpl.java index a89bd838..5a400b7a 100644 --- a/src/main/java/com/sqx/modules/announcement/service/impl/AnnouncementServiceImpl.java +++ b/src/main/java/com/sqx/modules/announcement/service/impl/AnnouncementServiceImpl.java @@ -23,21 +23,21 @@ public class AnnouncementServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - boolean flag = false; if (StrUtil.isNotBlank(title)) { queryWrapper.like(Announcement::getTitle, title); - flag = true; + } + if (type != null) { + queryWrapper.eq(Announcement::getType, type); } if (state != null) { queryWrapper.eq(Announcement::getState, state); - flag = true; } if (id != null) { queryWrapper.eq(Announcement::getId, id); } - return flag ? list(queryWrapper) : list(); + return queryWrapper.isEmptyOfWhere() ? list() : list(queryWrapper); } @Override