From 9ded1cc24d75fe3acd058aa1918624ff81bfcd50 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sat, 04 Dec 2021 14:24:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/workreport/controller/WorkReportController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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..3c86c61 100644
--- a/src/main/java/org/springblade/modules/workreport/controller/WorkReportController.java
+++ b/src/main/java/org/springblade/modules/workreport/controller/WorkReportController.java
@@ -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