Merge branch 'develop' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200 into lal

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

@@ -277,19 +277,22 @@ public class RouterUtils {
 						}else {
 							Compare compare;
 							for (Condition condition : listCondition) {
+									boolean condition_value = false;
 									for (String string : condition.getValues()) {
-										
 										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;
+											if (compare.GetResutl()) {
+												condition_value = true;
 											}
 										}else {
 											throw new Exception("审批流程设置有误");
 										}
-										
-										
+									}
+									if(condition_value) {
+										condition_b = true;
+									}else {
+										condition_b = false;
 									}
 							}
 						}