添加当警情信息不存在时空指针的问题

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertCalledServiceImpl.java

@@ -9,10 +9,6 @@ import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.yeejoin.amos.boot.module.common.api.dto.ESOrgUsrDto;
-import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
-import com.yeejoin.amos.boot.module.common.biz.service.impl.ESOrgUsrService;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -31,6 +27,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -46,8 +43,10 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.FormValue;
 import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrzhDto;
 import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
+import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.api.feign.JcsControlServerClient;
 import com.yeejoin.amos.boot.module.common.api.feign.KnowledgebaseFeignClient;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.ESOrgUsrService;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersServiceImpl;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.KeySiteServiceImpl;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
@@ -1023,6 +1022,9 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 		AlertCalledFormDto dto = (AlertCalledFormDto) selectAlertCalledByIdNoRedis(id);
 		AlertCalled alertCalled = dto.getAlertCalled();
 		List<FormValue> list = dto.getDynamicFormAlert();
+		if(ObjectUtils.isEmpty(alertCalled) ) {
+			return null;
+		}
 		if (alertCalled.getAlertTypeCode().equals(AlertStageEnums.YBHZ.getCode())) {// 一般火灾
 			String condition1 = alertCalled.getAlertType();// 一般火灾
 			String condition2 = alertCalled.getUnitInvolved();// 事发单位