From 75ef4de1c55e6029fbd2b37ee3b52665c9135b5f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 15 Dec 2021 15:27:41 +0800
Subject: [PATCH] 1. 派遣查询修改 2. 车辆定位接口修改，会报空指针 3. 日志输出修改管理 4. 证书导出Png图片不显示bug修复
---
src/main/java/org/springblade/modules/workreport/controller/WorkReportController.java | 18 ++++++++++++------
1 files changed, 12 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 5666d72..f2b9e37 100644
--- a/src/main/java/org/springblade/modules/workreport/controller/WorkReportController.java
+++ b/src/main/java/org/springblade/modules/workreport/controller/WorkReportController.java
@@ -185,13 +185,19 @@
if (null!=detail.getReplyDeptIds() && detail.getReplyDeptIds()!="" && !detail.getReplyDeptIds().isEmpty()) {
List<String> replyDeptIds = Arrays.asList(detail.getReplyDeptIds().split(","));
StringBuilder replyDeptNameInfo = new StringBuilder();
- for (String deptId : replyDeptIds) {
- //查询接收人单位信息
- Dept deptDetail = deptService.getById(Long.parseLong(deptId));
- replyDeptNameInfo = replyDeptNameInfo.append(deptDetail.getDeptName()).append(",");
+ if (replyDeptIds.size()>0) {
+ for (String deptId : replyDeptIds) {
+ //查询接收人单位信息
+ Dept deptDetail = deptService.getById(Long.parseLong(deptId));
+ if (null!= deptDetail) {
+ replyDeptNameInfo = replyDeptNameInfo.append(deptDetail.getDeptName()).append(",");
+ }
+ }
+ if (replyDeptNameInfo.length()>0) {
+ //截取
+ return replyDeptNameInfo.substring(0, replyDeptNameInfo.length() - 1);
+ }
}
- //截取
- return replyDeptNameInfo.substring(0, replyDeptNameInfo.length() - 1);
}
return null;
}
--
Gitblit v1.9.3