From e79c1b0d5deb09bd49b4c19d6fb80b5ba5abf23f Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sat, 04 Dec 2021 16:26:10 +0800
Subject: [PATCH] app接口调整
---
src/main/java/org/springblade/modules/workreport/controller/WorkReportController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 528e0ca..fbf0d52 100644
--- a/src/main/java/org/springblade/modules/workreport/controller/WorkReportController.java
+++ b/src/main/java/org/springblade/modules/workreport/controller/WorkReportController.java
@@ -98,7 +98,7 @@
public R submit(@RequestBody WorkReport workReport){
boolean status = false;
if (null==workReport.getId()){
- workReport.setReportTime(new Date());
+// workReport.setReportTime(new Date());
workReport.setReplyDeptIds(getReplyDeptIds(workReport.getReceivedIds()));
//新增
status = workReportService.save(workReport);
@@ -226,10 +226,15 @@
// user.setCardid(idCardNo);
// User userDetail = userService.getOne(Condition.getQueryWrapper(user));
User userDetail = userService.getById(userId);
- replyRealNameInfo = replyRealNameInfo.append(userDetail.getRealName()).append(",");
+ if (null!=userDetail) {
+ replyRealNameInfo = replyRealNameInfo.append(userDetail.getRealName()).append(",");
+ }
}
//截取
- return replyRealNameInfo.substring(0, replyRealNameInfo.length() - 1);
+ if (replyRealNameInfo.length()>0) {
+ return replyRealNameInfo.substring(0, replyRealNameInfo.length() - 1);
+ }
+ return replyRealNameInfo.toString();
}
}
--
Gitblit v1.9.3