*）修改规则对象判空

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

@@ -59,37 +59,40 @@ public class RuleAlertCalledService {
     	alertCalledRo.setUnitInvolved(alertCalled.getUnitInvolved());
     	
     	List<AlertFormValue> alertFormValues = alertCalledVo.getAlertFormValue();
-    	for (AlertFormValue alertFormValue : alertFormValues)
+    	if (ValidationUtil.isEmpty(alertFormValues))
 		{
-			if (alertFormValue.getFieldCode().equals("alertSubmittedId"))
-			{
-				alertCalledRo.setAlertSubmittedId(alertFormValue.getFieldValue());
-			}
-    		//一般火灾
-    		if (alertFormValue.getFieldCode().equals("fireLocation"))
-			{
-    			alertCalledRo.setFireLocation(alertFormValue.getFieldValue());
-			}
-    		if (alertFormValue.getFieldCode().equals("burningMaterial"))
-			{
-    			alertCalledRo.setBurningMaterial(alertFormValue.getFieldValue());
-			}
-    		if (alertFormValue.getFieldCode().equals("fireSituation"))
-			{
-    			alertCalledRo.setFireSituation(alertFormValue.getFieldValue());
-			}
-    		if (alertFormValue.getFieldCode().equals("dangerousExplosives"))
-			{
-    			alertCalledRo.setDangerousExplosives(alertFormValue.getFieldValue());
-			}
-    		//航空器救援
-    		
-    		//突发事件救援
-    		
-    		//漏油现场安全保障
-    		
-    		//专机保障
-
+    		for (AlertFormValue alertFormValue : alertFormValues)
+    		{
+    			if (alertFormValue.getFieldCode().equals("alertSubmittedId"))
+    			{
+    				alertCalledRo.setAlertSubmittedId(alertFormValue.getFieldValue());
+    			}
+    			//一般火灾
+    			if (alertFormValue.getFieldCode().equals("fireLocation"))
+    			{
+    				alertCalledRo.setFireLocation(alertFormValue.getFieldValue());
+    			}
+    			if (alertFormValue.getFieldCode().equals("burningMaterial"))
+    			{
+    				alertCalledRo.setBurningMaterial(alertFormValue.getFieldValue());
+    			}
+    			if (alertFormValue.getFieldCode().equals("fireSituation"))
+    			{
+    				alertCalledRo.setFireSituation(alertFormValue.getFieldValue());
+    			}
+    			if (alertFormValue.getFieldCode().equals("dangerousExplosives"))
+    			{
+    				alertCalledRo.setDangerousExplosives(alertFormValue.getFieldValue());
+    			}
+    			//航空器救援
+    			
+    			//突发事件救援
+    			
+    			//漏油现场安全保障
+    			
+    			//专机保障
+    			
+    		}
 		}
     	
     	//触发规则