From f1ec4ca26ffbe0a415ecac27bdee23982746c1cc Mon Sep 17 00:00:00 2001
From: yang_shj <1069818635@QQ.com>
Date: Tue, 18 Jul 2023 10:01:57 +0800
Subject: [PATCH] =?UTF-8?q?#=E5=80=BC=E7=8F=ADbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hnac/hzims/operational/main/vo/WindSubordinateVo.java     | 4 ++--
 .../operational/duty/service/impl/ImsDutyMainServiceImpl.java     | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/WindSubordinateVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/WindSubordinateVo.java
index 55c8142..68de51f 100644
--- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/WindSubordinateVo.java
+++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/WindSubordinateVo.java
@@ -27,12 +27,12 @@ public class WindSubordinateVo {
 
 	@ApiModelProperty(value = "地市名称")
 	private String areaName;
+	@ApiModelProperty(value = "经度(东经)")
 
-	@ApiModelProperty("经度(东经)")
 	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Float lgtd;
 
-	@ApiModelProperty("纬度(北纬)")
+	@ApiModelProperty(value = "纬度(北纬)")
 	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Float lttd;
 
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 3e66a8a..c4911e5 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
@@ -1765,12 +1765,16 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
 					eq(ImsDutyMainPersonEntity::getDutyMainId, s.getId());
 					last("limit 1");
 				}});
-				s.setManagerId(imsDutyMainPersonEntity.getDutyChargePerson().toString());
+				if(ObjectUtil.isNotEmpty(imsDutyMainPersonEntity.getDutyChargePerson())){
+					s.setManagerId(imsDutyMainPersonEntity.getDutyChargePerson().toString());
+				}
 			} else {
 				ImsDutyGroupEntity imsDutyGroupEntity = dutyGroupMapper.selectById(s.getDutyGroupId());
 				s.setGroupName(imsDutyGroupEntity.getGroupName());
 				s.setDutyGroupId(imsDutyGroupEntity.getId());
-				s.setManagerId(imsDutyGroupEntity.getManagerId().toString());
+				if(ObjectUtil.isNotEmpty(imsDutyGroupEntity.getManagerId())){
+					s.setManagerId(imsDutyGroupEntity.getManagerId().toString());
+				}
 			}
 			return s;
 		}).collect(Collectors.toList());