#值班bug修复

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;
 

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());