From 390eb925034c3f6dea83fc7ce2378ea40a93053d Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 06 Jul 2023 11:10:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java
index 9b3b029..a3da676 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java
@@ -292,9 +292,9 @@
list.add(jszrr);
}else {
// 巡查责任人姓名
- list.add("");
+ list.add("-");
// 技术责任人姓名
- list.add("");
+ list.add("-");
}
}
@@ -315,7 +315,7 @@
// 拼接水利部人员信息
list.add(builder.substring(0,builder.length()-1));
}else {
- list.add(" ");
+ list.add("-");
}
}
@@ -329,12 +329,12 @@
// 查询巡查责任人姓名，技术责任人姓名信息
List<PersonVO> personVOList = attResManagePersonClient.getPersonListByResGuid(list.get(0),personTypes);
if (personVOList.size()>0) {
- String xzzrr = " ";
- String zgzrr = " ";
- String jszrr = " ";
- String xczrr = " ";
+ String xzzrr = "-";
+ String zgzrr = "-";
+ String jszrr = "-";
+ String xczrr = "-";
for (PersonVO personVO : personVOList) {
- String str = null!=personVO.getPhone() ? ":"+personVO.getPhone():"";
+ String str = null!=personVO.getPhone() ? ":"+personVO.getPhone():"-";
if (personVO.getType().equals(split[0])) {
xzzrr = personVO.getName() + str;
}
@@ -358,7 +358,7 @@
list.add(xczrr);
}else {
for (String type : split) {
- list.add(" ");
+ list.add("-");
}
}
}
--
Gitblit v1.9.3