bugfix

efunbox-base/efunbox-base-api/src/main/java/cn/efunbox/manage/base/service/ManageService.java

@@ -6,7 +6,7 @@ import cn.efunbox.manage.common.result.ApiResult;
 
 public interface ManageService {
 
-    ApiResult list(ManageVO manageVO, Integer pageNo, Integer pageSize);
+    ApiResult list(ManageVO manageVO);
 
     ApiResult save(Manage manage);
 

efunbox-base/efunbox-base-api/src/main/java/cn/efunbox/manage/base/service/impl/ManageServiceImpl.java

@@ -56,10 +56,10 @@ public class ManageServiceImpl implements ManageService {
     CostTypeRepository costTypeRepository;
 
     @Override
-    public ApiResult list(ManageVO manageVO, Integer pageNo, Integer pageSize) {
-        Pageable pageable = new PageRequest(pageNo - 1, pageSize, SortHelper.sortMap2Sort(new LinkedHashMap<String, BaseOrderEnum>(){{put("happenTime", BaseOrderEnum.DESC);}}));
+    public ApiResult list(ManageVO manageVO) {
+        Pageable pageable = new PageRequest(manageVO.getPageNo() - 1,manageVO.getPageSize(), SortHelper.sortMap2Sort(new LinkedHashMap<String, BaseOrderEnum>(){{put("happenTime", BaseOrderEnum.DESC);}}));
         if(manageVO.getIsEntry()){
-            pageable = new PageRequest(pageNo - 1, pageSize, SortHelper.sortMap2Sort(new LinkedHashMap<String, BaseOrderEnum>(){{put("gmtModified", BaseOrderEnum.DESC);}}));
+            pageable = new PageRequest(manageVO.getPageNo() - 1, manageVO.getPageSize(), SortHelper.sortMap2Sort(new LinkedHashMap<String, BaseOrderEnum>(){{put("gmtModified", BaseOrderEnum.DESC);}}));
         }
         Specification specification = new Specification<Manage>() {
             @Override

efunbox-base/efunbox-base-api/src/main/java/cn/efunbox/manage/base/vo/ManageVO.java

@@ -51,4 +51,8 @@ public class ManageVO implements Serializable {
     private List<Long> deptIds;
 
     private Boolean isEntry;
+
+    private  Integer pageNo;
+
+    private Integer pageSize;
 }

efunbox-base/efunbox-base-web/src/main/java/cn/efunbox/manage/base/controller/ManageController.java

@@ -26,15 +26,15 @@ public class ManageController {
     @Autowired
     DepartmentService departmentService;
 
-    @GetMapping
-    public ApiResult findManage(ManageVO manageVO, Integer pageNo, Integer pageSize){
+    @PostMapping("/search")
+    public ApiResult findManage(@RequestBody ManageVO manageVO){
         ApiResult<List<Department>> deptResult = departmentService.getDeptChild(manageVO.getDeptId() == null ? 12345l : manageVO.getDeptId());
         List<Long> deptIds = new ArrayList<>();
         deptResult.getData().stream().forEach(department -> {
             deptIds.add(department.getId());
         });
         manageVO.setDeptIds(deptIds);
-        return manageService.list(manageVO, pageNo, pageSize);
+        return manageService.list(manageVO);
     }
 
     @PostMapping