|
@@ -192,7 +192,7 @@ public class BasicToWebServiceImpl implements BasicToWebService
|
|
|
public MyPageData<TourismProjectTravelNotesWriteVo> getTravelNotesPageList(TourismTravelNotesWriteDto dto){
|
|
|
//当belongTab为1的时候,则表明查询全部的游记
|
|
|
MyOrderParam myOrderParam = new MyOrderParam();
|
|
|
- myOrderParam.add(new MyOrderParam.OrderInfo("isHotspot",false,null));
|
|
|
+ myOrderParam.add(new MyOrderParam.OrderInfo("hotValue",false,null));
|
|
|
myOrderParam.add(new MyOrderParam.OrderInfo("updateTime",false,null));
|
|
|
String orderBy = MyOrderParam.buildOrderBy(myOrderParam, TourismProjectTravelNotesWrite.class);
|
|
|
|
|
@@ -223,6 +223,7 @@ public class BasicToWebServiceImpl implements BasicToWebService
|
|
|
tourismProjectTravelNotesWriteFilter.setIsOriginal(0);
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
if (MyCommonUtil.isNotBlankOrNull(dto.getSearchString())){
|
|
|
tourismProjectTravelNotesWriteFilter.setSearchString(dto.getSearchString());
|
|
|
}
|
|
@@ -251,12 +252,13 @@ public class BasicToWebServiceImpl implements BasicToWebService
|
|
|
if(dto.getPageNum() != null && dto.getPageSize() != null) {
|
|
|
PageMethod.startPage(dto.getPageNum(), dto.getPageSize(), true);
|
|
|
}
|
|
|
-
|
|
|
+ if(ObjectUtil.isEmpty(dto.getIsHotspot())){
|
|
|
+ tourismProjectTravelNotesWriteFilter.setIsHotspot(dto.getIsHotspot());
|
|
|
+ }
|
|
|
// List<TourTourismProjectTravelNotes> tourTourismProjectTravelNotesList =
|
|
|
// tourTourismProjectTravelNotesService.getTourTourismProjectTravelNotesList(tourismProjectTravelNotesWriteFilter, orderBy);
|
|
|
List<TourismProjectTravelNotesWrite> writeList =
|
|
|
tourismProjectTravelNotesWriteService.getTourismProjectTravelNotesWriteList(tourismProjectTravelNotesWriteFilter, orderBy);
|
|
|
-
|
|
|
MyPageData<TourismProjectTravelNotesWriteVo> pageData =
|
|
|
MyPageUtil.makeResponseData(writeList, TourismProjectTravelNotesWriteVo.class);
|
|
|
|