会议添加排序
diff --git a/src/main/java/com/supwisdom/dlpay/conference/api/controller/ConerenceApiController.java b/src/main/java/com/supwisdom/dlpay/conference/api/controller/ConerenceApiController.java
index d120120..bb6f838 100644
--- a/src/main/java/com/supwisdom/dlpay/conference/api/controller/ConerenceApiController.java
+++ b/src/main/java/com/supwisdom/dlpay/conference/api/controller/ConerenceApiController.java
@@ -172,7 +172,7 @@
}
if(StringUtil.isEmpty(userid)){
- mov.addObject("confid",1);
+ mov.addObject("confid",confid);
mov.setViewName("apph5/tempattend");
return mov;
}
diff --git a/src/main/java/com/supwisdom/dlpay/conference/service/impl/ConferenceServiceImpl.java b/src/main/java/com/supwisdom/dlpay/conference/service/impl/ConferenceServiceImpl.java
index 388ee1e..cddfaae 100644
--- a/src/main/java/com/supwisdom/dlpay/conference/service/impl/ConferenceServiceImpl.java
+++ b/src/main/java/com/supwisdom/dlpay/conference/service/impl/ConferenceServiceImpl.java
@@ -140,8 +140,13 @@
@NotNull
private Page<TConference> getConferencePage(String confname, String conftype, String deptcode, String confdate,String status, int pageNo, int pageSize) {
- Sort.Order order=new Sort.Order(Sort.Direction.DESC, "confdate");
- Pageable pageable = PageRequest.of(pageNo - 1, pageSize, Sort.by(order));
+ Sort.Order order1=new Sort.Order(Sort.Direction.DESC, "confdate");
+ Sort.Order order2=new Sort.Order(Sort.Direction.DESC, "confid");
+ List<Sort.Order> list = new ArrayList<>();
+ list.add(order1);
+ list.add(order2);
+ Sort sort =Sort.by(list);
+ Pageable pageable = PageRequest.of(pageNo - 1, pageSize, sort);
return conferenceDao.findAll(new Specification<TConference>() {