现存量

app/Service/EmployeeService.php

@@ -465,19 +465,20 @@ class EmployeeService extends Service
 
             $data['data'][$key]['upd_time'] = time();
 
+            //Depart::whereRaw("(binary code = '{$value['code']}' OR title = '{$value['title']}')")
             if($is_check){
                 $data['data'][$key]['crt_time'] = time();
-                $bool = Depart::whereRaw("(binary code = '{$value['code']}' OR title = '{$value['title']}')")
+                $bool = Depart::whereRaw("binary code = '{$value['code']}'")
                     ->where('del_time',0)
                     ->exists();
             }else{
                 if($this->isEmpty($data,'id')) return [false,'id不能为空！'];
-                $bool = Depart::whereRaw("(binary code = '{$value['code']}' OR title = '{$value['title']}')")
+                $bool = Depart::whereRaw("binary code = '{$value['code']}'")
                     ->where('id','<>',$data['id'])
                     ->where('del_time',0)
                     ->exists();
             }
-            if($bool) return [false,'编码或部门名称不能重复'];
+            if($bool) return [false,'编码不能重复'];
         }
 
         return [true, $data];

app/Service/SalesOrderService.php

@@ -409,18 +409,18 @@ class SalesOrderService extends Service
                 ->select('sales_order_id')
                 ->get()->toArray();
             $sales_order_id = array_unique(array_column($sales_order_id,'sales_order_id'));
-            $model->whereIn('id',$sales_order_id);
 
             //指派后
             $user_id = $user['id'];
             $depart_id = $user['depart_range'];
-            $sales_order_id = SalesOrderRange::where('del_time',0)
+            $sales_order_id2 = SalesOrderRange::where('del_time',0)
                 ->where(function ($query) use($user_id, $depart_id) {
                     $query->where('employee_id',$user_id)
                         ->orWhereIn('depart_id', $depart_id);
                 })->select('sales_order_id')->get()
                 ->toArray();
-            $model->whereIn('id',array_column($sales_order_id,'sales_order_id'));
+            $sales_order_id = array_unique(array_merge_recursive($sales_order_id,array_column($sales_order_id2,'sales_order_id')));
+            $model->whereIn('id',$sales_order_id);
         }
         if(! empty($data['sales_order_type'])) $model->where('sales_order_type',$data['sales_order_type']);
         if(! empty($data['title'])) $model->where('title', 'LIKE', '%'.$data['title'].'%');