[Fix]属性设置节点判断

Author: lizhigang

app/Http/Controllers/ProcessController.php

@@ -142,6 +142,22 @@ public function update(Request $request, $id)
 
             $process=Process::findOrFail($id);
 
+            if(in_array($data['process_position'], [9])){
+                if(Flowlink::where('process_id',$id)->where("type","Condition")->count()>1){
+                    return redirect()->back()->with(['status_code'=>1,'message'=>'该节点是分支节点，不能设置为结束或起始步骤']);
+                }
+            }
+
+            if(in_array($data['process_position'], [0])){
+                Process::where(['flow_id'=>$process->flow_id,'position'=>0])->update([
+                    'position'=>1
+                ]);
+
+                Process::where(['flow_id'=>$process->flow_id,'id'=>$id])->update([
+                    'position'=>0
+                ]);
+            }
+
             $process->update([
                 'process_name'=>$process_name,
                 'style_color'=>$style_color,
@@ -410,6 +426,13 @@ public function setFirst(Request $request){
         $flow_id=$request->input('flow_id',0);
         $process_id=$request->input('process_id',0);
 
+        if(Flowlink::where('process_id',$process_id)->where("type","Condition")->where('next_process_id','>','-1')->count()>1){
+            return response()->json([
+                'status_code'=>1,
+                'message'=>'该节点是分支节点，不能设置为结束步骤'
+            ]);
+        }
+
         Process::where(['flow_id'=>$flow_id,'position'=>0])->update([
             'position'=>1
         ]);
@@ -427,7 +450,7 @@ public function setLast(Request $request){
         $flow_id=$request->input('flow_id',0);
         $process_id=$request->input('process_id',0);
 
-        if(Flowlink::where('process_id',$process_id)->where('next_process_id','>','-1')->count()>1){
+        if(Flowlink::where('process_id',$process_id)->where("type","Condition")->where('next_process_id','>','-1')->count()>1){
             return response()->json([
                 'status_code'=>1,
                 'message'=>'该节点是分支节点，不能设置为结束步骤'

app/Service/Workflow/Workflow.php

@@ -247,7 +247,7 @@ public function flowlink(int $process_id){
 	                        	$this->goToProcess($proc->entry->parent_entry,$proc->entry->enter_process->child_back_process);
 	                            $proc->entry->parent_entry->process_id=$proc->entry->enter_process->child_back_process;
 	                        }else{
-	                        	//默认进入当前子流程步骤下一步
+	                        	//默认进入父流程步骤下一步
 	                        	$parent_flowlink=Flowlink::where(['process_id'=>$proc->entry->enter_process->id,"type"=>"Condition"])->first();
 
 	                        	//判断是否为最后一步
@@ -263,12 +263,12 @@ public function flowlink(int $process_id){
 	                        		$this->goToProcess($proc->entry->parent_entry,$parent_flowlink->next_process_id);
 
 	                                $proc->entry->parent_entry->process_id=$parent_flowlink->next_process_id;
+	                                $proc->entry->parent_entry->status=0;
 	                        	}
 	                        }
 
 	                        $proc->entry->parent_entry->child=0;
-	                        $proc->entry->parent_entry->status=0;
-
+	                        
 	                        $proc->entry->parent_entry->save();
 	                    }
 

resources/views/flow/design.blade.php

@@ -86,7 +86,7 @@
     <!-- <li id="addson"><i class="icon-plus"></i>&nbsp;<span class="_label">添加子步骤</span></li> -->
     <!-- <li id="copy"><i class="icon-check"></i>&nbsp;<span class="_label">复制</span></li> -->
     <li id="delete"><i class="icon-trash"></i>&nbsp;<span class="_label">删除</span></li>
-    <li id="begin"><i class="icon-play"></i>&nbsp;<span class="_label">设为第一步</span></li>
+    <!-- <li id="begin"><i class="icon-play"></i>&nbsp;<span class="_label">保存</span></li> -->
     <!-- <li id="stop"><i class="icon-stop"></i>&nbsp;<span class="_label">设最后一步</span></li> -->
   </ul>
 </div>

resources/views/proc/index.blade.php

@@ -47,7 +47,6 @@
                       @elseif($v->status==-1)
                         <button class="btn btn-xs btn-danger">驳回</button>
                       @endif
-                      
                       @if($child=\App\Entry::where('pid',$v->entry->id)->whereIn('enter_proc_id',explode(',',$v->id))->first())
                       <a href="/proc/children?entry_id={{$child->id}}" class="btn btn-xs btn-primary">子流程</a>
                       @endif