Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!344

src/main/java/cn/timer/api/utils/router/RouterUtils.java

@@ -274,12 +274,17 @@ public class RouterUtils {
 							for (Condition condition : listCondition) {
 							for (Condition condition : listCondition) {
 									for (String string : condition.getValues()) {
 									for (String string : condition.getValues()) {
 										
 										
-										// 简单工厂模式 - 判断条件
-										compare = CompareFactory.createCompare(obj.get(condition.getKey(),FromData.class).getValue(), string, condition.getFormat());
-										if (!compare.GetResutl()) {
-											condition_b = false;
+										if(obj.get(condition.getKey(),FromData.class).getValue() != null) {
+											// 简单工厂模式 - 判断条件
+											compare = CompareFactory.createCompare(obj.get(condition.getKey(),FromData.class).getValue(), string, condition.getFormat());
+											if (!compare.GetResutl()) {
+												condition_b = false;
+											}
+										}else {
+											throw new Exception("审批流程设置有误");
 										}
 										}
 										
 										
+										
 									}
 									}
 							}
 							}
 						}
 						}