Merge branch 'master' of ssh://119.23.72.7:22611/q578953158/php_frq_api

app/Http/Controllers/PermController.php

@@ -357,27 +357,19 @@ class PermController extends Controller
 		array_unshift($sale_ids, $userId); // 将当前用户添加到数组
 
 
-		$user_info = DB::table('user_info')->where('userId', $userId)->select('department_id')->first(); // 用户信息
+		$department_id = DB::table('user_info')->where('userId', $userId)->value('department_id'); // 用户信息
 
-		if (!$user_info['department_id']) return $sale_ids;
+		if (!$department_id) return $sale_ids;
 
-		// 获取当前用户下级部门
-		$department = DB::table('user_department')
-					->where('parent_id', $user_info['department_id'])
-					->select('department_id', 'department_name')
-					->get(); 
+		$department_ids = [];
 
-		if (!$department) {
-			$tmp = DB::table('user_info')->where('department_id', $user_info['department_id'])->lists('userId');
+		$this->getSubDepartmentId($department_id, $department_ids); // 获取下级部门ID
 
-			$sale_ids = array_merge($sale_ids, $tmp);
-		} else {
-			// 获取下级部门的人员
-			foreach ($department as $v) {
-				$tmp = DB::table('user_info')->where('department_id', $v['department_id'])->lists('userId');
+		// 获取下级部门的人员
+		foreach ($department_ids as $v) {
+			$tmp = DB::table('user_info')->where('department_id', $v)->lists('userId');
 
-				$sale_ids = array_merge($sale_ids, $tmp);
-			}
+			$sale_ids = array_merge($sale_ids, $tmp);
 		}
 
 		return array_unique($sale_ids); // 去重返回

app/Model/QuoteModel.php

@@ -205,7 +205,6 @@ class QuoteModel extends Model
 
             if ($quote_info['status'] == -1) return [1, '撤销失败，该报价已撤销，请刷新页面查看'];
             if ($quote_info['status'] == 3) return [1, '撤销失败，该报价已确认，请刷新页面查看'];
-            // if ($quote_info['status'] > 1) return [1, '当前报价状态不能撤销，请刷新页面查看'];
 
             $res = $this->where('id', $id)->update(['status' => -1, 'cancel_reason'=>$cancel_reason]);
 
@@ -213,6 +212,13 @@ class QuoteModel extends Model
             $InquiryItemsAssignModel = new InquiryItemsAssignModel;
             $InquiryItemsAssignModel->delAssign($quote_info['inquiry_items_id'], $quote_info['create_uid']);
 
+            // 查看当前询价明细的报价数量，若为0，则更新询价明细状态为待报价
+            $count = $this->where('inquiry_items_id', $quote_info['inquiry_items_id'])->where('status', '<>', -1)->count();
+            if (!$count) {
+                $InquiryItemsModel = new InquiryItemsModel;
+                $InquiryItemsModel->where('id', $quote_info['inquiry_items_id'])->update(['status' => 1]);
+            }
+
             $data = [];
             $data['types']       = 2;
             $data['relation_id'] = $id;