From ec1cb265b0d2d98172fd7a58512218959eae8359 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 02 Dec 2021 23:28:55 +0800
Subject: [PATCH] 保安员，单位检查，工作汇报修改
---
src/main/java/org/springblade/modules/workreport/controller/WorkReportController.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 ae73a36..3c86c61 100644
--- a/src/main/java/org/springblade/modules/workreport/controller/WorkReportController.java
+++ b/src/main/java/org/springblade/modules/workreport/controller/WorkReportController.java
@@ -97,7 +97,7 @@
@PostMapping("/submit")
public R submit(@RequestBody WorkReport workReport){
boolean status = false;
- if (null!=workReport.getId()){
+ if (null==workReport.getId()){
workReport.setReportTime(new Date());
workReport.setReplyDeptIds(getReplyDeptIds(workReport.getReceivedIds()));
//新增
@@ -119,9 +119,13 @@
FtpUtil.sqlFileUpload(s1);
}else {
workReport.setReplyDeptIds(getReplyDeptIds(workReport.getReceivedIds()));
- if (null!=workReport.getReplyTime()){
+ if (null==workReport.getReplyTime()){
workReport.setReplyTime(new Date());
}
+
+ //修改
+ status = workReportService.updateById(workReport);
+
//内网同步
String s1 =
"update sys_work_report set type = " + "'" + workReport.getType() + "'" +
@@ -222,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