|
@@ -1,6 +1,7 @@
|
|
|
package cn.efunbox.manage.base.service.impl;
|
|
|
|
|
|
import cn.efunbox.manage.base.entity.*;
|
|
|
+import cn.efunbox.manage.base.enums.BaseStatusEnum;
|
|
|
import cn.efunbox.manage.base.enums.IncomeStatusEnum;
|
|
|
import cn.efunbox.manage.base.repository.*;
|
|
|
import cn.efunbox.manage.base.service.ManageService;
|
|
@@ -48,7 +49,9 @@ public class ManageServiceImpl implements ManageService {
|
|
|
@Override
|
|
|
public ApiResult list(ManageVO manageVO) {
|
|
|
Pageable pageable = new PageRequest(manageVO.getPageNo() - 1,manageVO.getPageSize(), SortHelper.sortMap2Sort(new LinkedHashMap<String, BaseOrderEnum>(){{put("happenTime", BaseOrderEnum.DESC);}}));
|
|
|
+// manageVO.setStatus(BaseStatusEnum.NORMAL);
|
|
|
if(manageVO.getIsEntry()){
|
|
|
+ manageVO.setStatus(BaseStatusEnum.NORMAL);
|
|
|
pageable = new PageRequest(manageVO.getPageNo() - 1, manageVO.getPageSize(), SortHelper.sortMap2Sort(new LinkedHashMap<String, BaseOrderEnum>(){{put("gmtModified", BaseOrderEnum.DESC);}}));
|
|
|
}
|
|
|
Specification specification = (Specification<Manage>) (root, criteriaQuery, criteriaBuilder) -> {
|