diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/FeedbackController.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/FeedbackController.java index becf028c6..2fc85cbe4 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/FeedbackController.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/FeedbackController.java @@ -65,6 +65,7 @@ public class FeedbackController { wrapper.like(StrUtil.isNotBlank(feedback.getTitle()),FeedbackEntity::getTitle,feedback.getTitle()); wrapper.eq(StrUtil.isNotBlank(feedback.getStatus()),FeedbackEntity::getStatus,feedback.getStatus()); wrapper.eq(StrUtil.isNotBlank(feedback.getType()),FeedbackEntity::getType,feedback.getType()); + wrapper.orderByDesc(FeedbackEntity::getCreateTime).orderByDesc(FeedbackEntity::getStatus); return R.ok(feedbackService.page(page, wrapper)); } diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/VisitorsController.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/VisitorsController.java index 2e8141b75..473d4e482 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/VisitorsController.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/VisitorsController.java @@ -67,7 +67,7 @@ public class VisitorsController { */ @Operation(summary = "通过id查询" , description = "通过id查询" ) @GetMapping("/{id}" ) - @PreAuthorize("@pms.hasPermission('integrated_visitors_view')" ) +// @PreAuthorize("@pms.hasPermission('integrated_visitors_view')" ) public R getById(@PathVariable("id" ) Long id) { return R.ok(visitorsService.getById(id)); }