Merge branch 'master' of http://119.23.72.7/zhujilai/Order into zjl_te_20200402

app/Http/Controllers/PermController.php

@@ -157,6 +157,7 @@
 						foreach ($userId as $id) {
 							$userInfo = DB::table('user_info')->where('userId', $id)->select('userId', 'name', 'email', 'status')->first();
 
+							if (!$userInfo) continue;
 							// 判断用户是否已离职 4为离职状态
 							// if ($userInfo->status != 4) {
 								$roleUsers[] = $userInfo;