1
0

2 کامیت‌ها 1920e46d56 ... 7221301daf

نویسنده SHA1 پیام تاریخ
  任敬轩 7221301daf Merge branch 'master' of http://git.jieweizhineng.com/ushio/video_system into master 1 ماه پیش
  任敬轩 1139fee680 全流程接口 1 ماه پیش
1فایلهای تغییر یافته به همراه2 افزوده شده و 2 حذف شده
  1. 2 2
      Modules/Admin/Services/ApiService.php

+ 2 - 2
Modules/Admin/Services/ApiService.php

@@ -48,7 +48,7 @@ class ApiService{
         $result['data']   = [];
 
         //区域字典录入
-        $area = DB::connection('mysql_fwe10')->table('uf_zhxx_qlcqyzd')->where('szxmc',$params['xjdw'])->orderBy('areaid','desc')->get();
+        $area = DB::connection('mysql_fwe10')->table('uf_zhxx_qlcqyzd')->where('szxmc',$params['xjdw'])->where('IS_DELETE',0)->orderBy('areaid','desc')->get();
 
         $is_insert = true;
 
@@ -242,7 +242,7 @@ class ApiService{
 
             $area_list = DB::connection('mysql_fwe10')->table('uf_zhxx_qlcqyzd')
                 ->whereNotIn('qymc', $area_arr)
-                ->where('szxmc', $depart)->orderBy('areaid', 'asc')->get();
+                ->where('szxmc', $depart)->where('IS_DELETE',0)->orderBy('areaid', 'asc')->get();
             foreach ($area_list as $area) {
                 $res[] = [
                     'area'    => $area->qymc,