diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/UserReplyController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/UserReplyController.java index 710b8b5..e09f147 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/UserReplyController.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/UserReplyController.java @@ -71,10 +71,10 @@ } else { Long userId = shiroUser.getId(); query.eq("user_id", userId); - query.orderBy("num", false); + page = userReplyService.selectPage(page, query); } - + query.orderBy("num", true); return ResponseData.success(super.packForBT(page)); } diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/UserReplyController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/UserReplyController.java index 710b8b5..e09f147 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/UserReplyController.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/UserReplyController.java @@ -71,10 +71,10 @@ } else { Long userId = shiroUser.getId(); query.eq("user_id", userId); - query.orderBy("num", false); + page = userReplyService.selectPage(page, query); } - + query.orderBy("num", true); return ResponseData.success(super.packForBT(page)); } diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/UserReplyServiceImpl.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/UserReplyServiceImpl.java index c57b3aa..d2b5dba 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/UserReplyServiceImpl.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/UserReplyServiceImpl.java @@ -35,7 +35,7 @@ public List selectByUserId(Long userId) { EntityWrapper query = new EntityWrapper<>(); query.eq("user_id", userId); - query.orderBy("num", false); + query.orderBy("num", true); return userReplyService.selectList(query); } @@ -43,6 +43,7 @@ public List selectByType(String type) { EntityWrapper query = new EntityWrapper<>(); query.eq("type", type); + query.orderBy("num", true); return userReplyService.selectList(query); }