diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/only/controller/admin/only/onlyofController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/only/controller/admin/only/onlyofController.java index 47bd38a..0d94a38 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/only/controller/admin/only/onlyofController.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/only/controller/admin/only/onlyofController.java @@ -173,6 +173,7 @@ public class onlyofController { public void download(String name, String cDate,HttpServletResponse response) { cDate = cDate.equals("") ? cDate : cDate + "\\"; // System.out.println("download: "+name+"---"+response+"---"+uuid); + System.out.println("cDate:"+cDate); try { FileUtil.downLoadFile(name,filePath+cDate,response); } catch (IOException e) { @@ -205,12 +206,13 @@ public class onlyofController { @GetMapping("/editStatus") @Operation(summary = "文件状态") @PreAuthorize("@ss.hasPermission('only:onlyof:editStatus')") - public ResponseEntity getDoucmentEditStatus(String name) throws ParseException { + public ResponseEntity getDoucmentEditStatus(String name,String cDate) throws ParseException { + cDate = (cDate != null && !cDate.isEmpty()) ? cDate + "\\" : cDate; // System.out.println("editStatus"); String url = officeUrl+officeCommand; Map map = new HashMap(); map.put("c", "forcesave"); - String docFileMd5 = Md5Utils.getFileMd5(new File(filePath+name)); + String docFileMd5 = Md5Utils.getFileMd5(new File(filePath+cDate+name)); if (StringUtils.isBlank(docFileMd5)) { // throw new DocumentException(ErrorCodeEnum.DOC_FILE_MD5_ERROR); } diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/hygl/HyglController.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/hygl/HyglController.java index 241e786..f90e121 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/hygl/HyglController.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/hygl/HyglController.java @@ -76,6 +76,7 @@ public class HyglController { @Operation(summary = "获得会议管理分页") @PreAuthorize("@ss.hasPermission('home:hygl:query')") public CommonResult> getHyglPage(@Valid HyglPageReqVO pageReqVO) { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); PageResult pageResult = hyglService.getHyglPage(pageReqVO); // PageResult pageResult = hyglService.getHyglPage(getLoginUserId(), pageReqVO); return success(BeanUtils.toBean(pageResult, HyglRespVO.class)); diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/rcgl/RcglController.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/rcgl/RcglController.java index 0834ef9..e90b466 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/rcgl/RcglController.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/rcgl/RcglController.java @@ -75,6 +75,7 @@ public class RcglController { @Operation(summary = "获得领导日程安排分页") @PreAuthorize("@ss.hasPermission('home:rcgl:query')") public CommonResult> getRcglPage(@Valid RcglPageReqVO pageReqVO) { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); PageResult pageResult = rcglService.getRcglPage(pageReqVO); return success(BeanUtils.toBean(pageResult, RcglRespVO.class)); }