From 440e0747c73a32c324687e95401c84b5930f2ce5 Mon Sep 17 00:00:00 2001
From: tyty <hello>
Date: Thu, 28 Sep 2023 18:16:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E7=8F=AD=E8=AE=A1=E5=88=92bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java
index 382b1c7..9e5f8b4 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java
@@ -785,8 +785,8 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
                         last(" limit 1");
                     }});
                     //如果person的表中有班组名称，则直接取
-                    if (ObjectUtil.isNotEmpty(imsDutyMainPersonEntity) && imsDutyMainPersonEntity.getDutyGroupName() != null) {
-                        s.setName(imsDutyMainPersonEntity.getDutyGroupName());
+                    if (ObjectUtil.isNotEmpty(imsDutyMainPersonEntity) &&StringUtil.isNotBlank(imsDutyMainPersonEntity.getDutyGroupName())) {
+                        s.setName(s.getName()+imsDutyMainPersonEntity.getDutyGroupName());
                     } else {
                         //否则，拼接对应人员
                         String[] split = s.getDutyPersonIds().split("\\^");