解决冲突

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

@@ -410,7 +410,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 				for (AlertFormValue alertFormValue : list) {
 					if("flightNumber".equals(alertFormValue.getFieldCode())) {
 						FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(),
-								"text", ValidationUtil.isEmpty(alertFormValue.getFieldValueCode()) ?  alertFormValue.getFieldValue() : alertFormValue.getFieldValueCode()  , alertFormValue.getBlock());
+								"text", ValidationUtil.isEmpty(alertFormValue.getFieldValue()) ?  alertFormValue.getFieldValueCode() : alertFormValue.getFieldValue()  , alertFormValue.getBlock());
 						formValue.add(value);
 						continue;
 					}

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

@@ -1885,6 +1885,9 @@ public class ExcelServiceImpl {
 			cell = row.getCell(3);
 			if (cell != null) {
 				String[] splitStr = cell.toString().split("@");
+				if (splitStr[0].equals("null")){
+					throw new BadRequest("模板中用户岗位不正确，请补充完整后再进行操作");
+				}
 				dutyFireFightingDto.setPostTypeName(splitStr[0]);
 				dutyFireFightingDto.setPostType(splitStr[1]);
 			}