Selaa lähdekoodia

计量驳回任务时 没有按垂直审批或平行审批的要去执行

cr 2 kuukautta sitten
vanhempi
commit
4b08755224

+ 7 - 2
blade-service/blade-meter/src/main/java/org/springblade/meter/controller/TaskController.java

@@ -898,8 +898,13 @@ public class TaskController extends BladeController {
                         currentParallelId = parallel.getId();
                         break;
                     }
-                    if (parallel.getStatus() != 2) {
-                        name.add(parallel.getTaskUserName());
+                    //判断是否是流程审批
+                    String sql="select COALESCE(fixed_flow_link_type, 0) from u_fixed_flow_link where fixed_flow_id="+task.getFixedFlowId()+" and fixed_flow_link_user="+parallel.getTaskUser()+" limit 1";
+                    Integer fixedFlowLinkType =   jdbcTemplate.queryForObject(sql,Integer.class);
+                    if(fixedFlowLinkType==1){
+                        if (parallel.getStatus() != 2) {
+                            name.add(parallel.getTaskUserName());
+                        }
                     }
                 }
                 if (name.size() > 0) {