From 08d8ba142a2d786b7b82b239d43d6156d8afd82d Mon Sep 17 00:00:00 2001
From: tanghaihao <850814414@qq.com>
Date: Mon, 4 Sep 2023 23:47:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8E=92=E7=8F=AD=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E8=BF=87=E6=BB=A4=E8=B0=83=E4=BC=91=E6=81=AF=E6=8E=92?=
 =?UTF-8?q?=E7=8F=AD=20=E8=A7=A3=E5=86=B3=E8=AE=BE=E5=A4=87=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=AF=BC=E5=85=A5=E5=AD=90=E8=AE=BE=E5=A4=87=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/hnac/hzims/operational/OperationalConstants.java | 2 +-
 .../hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java    | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/OperationalConstants.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/OperationalConstants.java
index 93810fc..e77517e 100644
--- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/OperationalConstants.java
+++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/OperationalConstants.java
@@ -4,7 +4,7 @@ import lombok.Getter;
 
 public class OperationalConstants {
 
-	public final static String APP_NAME = "hzims-operational";
+	public final static String APP_NAME = "hzims-operational-thh";
 
 
 
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 ecc07ca..12e283d 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
@@ -1427,6 +1427,9 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
 				ImsDutyMainReportExcel reportExcel = new ImsDutyMainReportExcel();
 
 				ImsDutyClassEntity imsDutyClass = deptDutyClassMap.get(imsDutyMainEntity.getClassId());
+				if (Func.isEmpty(imsDutyClass)) {
+					continue;
+				}
 				reportExcel.setDutyDate(dateStr);
 				reportExcel.setClassName(imsDutyClass.getClassName() + "(" + imsDutyClass.getStartTime() + " - " + imsDutyClass.getEndTime() + ")");