[Fix]部门主管经理未设置处理

Author: lizhigang

app/Http/Controllers/EntryController.php

@@ -93,7 +93,7 @@ public function store(Request $request)
             return redirect()->to('/');
         }catch(\Exception $e){
             DB::rollback();
-            dd($e);
+            return redirect()->back()->with(['success'=>-1,'message'=>$e->getMessage()]);
         }
     }
 
@@ -206,7 +206,7 @@ public function resend(Request $request){
 
         }catch(\Exception $e){
             DB::rollback();
-            dd($e);
+            return redirect()->back()->with(['success'=>-1,'message'=>$e->getMessage()]);
         }
 
     }
@@ -227,7 +227,7 @@ public function cancel(Request $request){
 
         }catch(\Exception $e){
             DB::rollback();
-            dd($e);
+            return redirect()->back()->with(['success'=>-1,'message'=>$e->getMessage()]);
         }
 
     }

app/Http/Controllers/FlowController.php

@@ -199,7 +199,7 @@ public function publish(Request $request){
             ]);
 
         }catch(\Exception $e){
-            dd($e);
+            return redirect()->back()->with(['status_code'=>1,'message'=>$e->getMessage()]);
         }
     }
 }

app/Http/Controllers/ProcController.php

@@ -135,8 +135,8 @@ public function unpass(Request $request,$id){
 
             DB::commit();
         }catch(\Exception $e){
-            dd($e);
             DB::rollback();
+            return redirect()->back()->with(['success'=>-1,'message'=>$e->getMessage()]);
         }
 
         return response()->json(['status_code'=>0]);

app/Http/Controllers/ProcessController.php

@@ -94,7 +94,7 @@ public function store(Request $request)
             return response()->json($res);
         }catch(\Exception $e){
             DB::rollback();
-            dd($e);
+            return redirect()->back()->with(['status_code'=>-1,'message'=>$e->getMessage()]);
         }
     }
 
@@ -365,7 +365,7 @@ public function destroy(Request $request,$id)
             return response()->json(['status_code'=>0,'message'=>'删除成功']);
         }catch(\Exception $e){
             DB::rollback();
-            dd($e);
+            return redirect()->back()->with(['status_code'=>-1,'message'=>$e->getMessage()]);
         }
     }
 

app/Service/Workflow/Workflow.php

@@ -24,11 +24,17 @@ protected function getProcessAuditorIds(Entry $entry,$process_id){
 
 			if($flowlink->auditor=='-1001'){
 				//发起人部门主管
+				if(empty($entry->emp->dept)){
+					return $auditor_ids;
+				}
 				$auditor_ids[]=$entry->emp->dept->director_id;
 			}
 
 			if($flowlink->auditor=='-1002'){
 				//发起人部门经理
+				if(empty($entry->emp->dept)){
+					return $auditor_ids;
+				}
 				$auditor_ids[]=$entry->emp->dept->manager_id;
 			}
 		}else{
@@ -97,7 +103,7 @@ public function setFirstProcessAuditor(Entry $entry,Flowlink $flowlink){
 	    //步骤流转
 	    //步骤审核人
 	    $auditors=Emp::whereIn('id',$auditor_ids)->get();
-	    if(empty($auditors)){
+	    if($auditors->count()<1){
 	        throw new \Exception("下一步骤未找到审核人", 1);
 	    }
 	    $time=time();
@@ -163,9 +169,13 @@ public function flowlink($process_id){
 	        }
 
 	        $auditor_ids=$this->getProcessAuditorIds($proc->entry,$flowlink->next_process_id);
+	        if(empty($auditor_ids)){
+	        	throw new \Exception("下一步骤未找到审核人", 1);
+	        }
+
 	        $auditors=Emp::whereIn('id',$auditor_ids)->get();
 
-	        if(empty($auditors)){
+	        if($auditors->count()<1){
 	            throw new \Exception("下一步骤未找到审核人", 1);
 	        }
 
@@ -281,7 +291,7 @@ public function flowlink($process_id){
 	                $auditor_ids=$this->getProcessAuditorIds($proc->entry,$flowlink->next_process_id);
 	                $auditors=Emp::whereIn('id',$auditor_ids)->get();
 
-	                if(empty($auditors)){
+	                if($auditors->count()<1){
 	                    throw new \Exception("下一步骤未找到审核人", 1);
 	                }
 	                foreach($auditors as $v){
@@ -334,7 +344,7 @@ protected function goToProcess(Entry $entry,$process_id){
 
 	    $auditors=Emp::whereIn('id',$auditor_ids)->get();
 
-	    if(empty($auditors)){
+	    if($auditors->count()<1){
 	        throw new \Exception("下一步骤未找到审核人", 1);
 	    }
 	    $time=time();

resources/views/layouts/app.blade.php

@@ -116,8 +116,10 @@
     $(function(){
         var success='{{Session::get("success")}}';
         var message='{{Session::get("message")}}';
-        if(success){
+        if(success==1){
             toastr.success(message);
+        }else if(success==-1){
+            toastr.error(message);
         }
 
         //后台删除公共函数