From 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 19 Aug 2021 15:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/workreport/controller/WorkReportController.java | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/workreport/controller/WorkReportController.java b/src/main/java/org/springblade/modules/workreport/controller/WorkReportController.java
index ab7ec7d..86e4b0c 100644
--- a/src/main/java/org/springblade/modules/workreport/controller/WorkReportController.java
+++ b/src/main/java/org/springblade/modules/workreport/controller/WorkReportController.java
@@ -66,11 +66,6 @@
@GetMapping("/pageReply")
public R<IPage<WorkReportVo>> pageReply(WorkReportVo workReport, Query query) {
IPage<WorkReportVo> pages = workReportService.selectWorkReplyPage(Condition.getPage(query), workReport);
-// List<WorkReportVo> records = pages.getRecords();
-// for (WorkReportVo record : records) {
-// record.setReplyRealName(getReplyRealName(record));
-// record.setReplyDeptName(getReplyDeptName(record));
-// }
return R.data(pages);
}
@@ -106,7 +101,7 @@
workReport.setReportTime(new Date());
workReport.setReplyDeptIds(getReplyDeptIds(workReport.getReceivedIds()));
}
- arg.test01(arg.url+"/workReport/submit",workReport);
+ //arg.test01(arg.url+"/workReport/submit",workReport);
return R.status(workReportService.saveOrUpdate(workReport));
}
@@ -116,6 +111,7 @@
*/
@PostMapping("/remove")
public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
+ //arg.sendPostRemoveByIds(arg.url+"/workReport/remove",ids);
return R.status(workReportService.removeByIds(Func.toLongList(ids)));
}
--
Gitblit v1.9.3