细节优化，供应商升级优化

app/controller/CompanyItem.php

@@ -359,12 +359,13 @@ class CompanyItem extends BaseController
         $itemids = Db::name('account_item')
             ->whereIn('account_id', $param['uid'])
             ->column('itemid', 'account_id');
+
         $res = $item_tmp = [];
 
         //获取所有部门id对应的部门名称
         foreach ($itemids as $itemid) {
             if (!isset($item_tmp[$itemid])) {
-                if ($param['get_tops'] == 1) $tmp = get_part($itemid);
+                if ($param['get_tops']==1) $tmp = get_part($itemid);
                 else $tmp = Db::name('company_item')
                     ->field('id,name,pid')
                     ->where(['is_del' => 0, 'id' => $itemid])
@@ -376,8 +377,8 @@ class CompanyItem extends BaseController
         }
 
         if (is_numeric($param['uid'])) $param['uid'] = [$param['uid']];
-        foreach ($param['uid'] as $uid) {
-            if (!isset($res[$uid])) $res[$uid] = $item_tmp[$itemids[$uid]] ?? '';
+        foreach ($itemids as $uid=>$itemid) {
+            if(!isset($res[$uid])) $res[$uid] = $item_tmp[$itemid] ?? '';
         }
 
         return json_show(0, '获取成功', $res);

app/controller/Headquarters.php

@@ -28,7 +28,8 @@ class Headquarters extends BaseController
                 ->column('companyCode');
             $condition[] = ['code', 'in', $companyCode];
         }
-        if ($post['type'] !== '') $condition[] = ['', 'exp', Db::raw("FIND_IN_SET({$post['type']},type)")];
+//        if ($post['type'] !== '') $condition[] = ['', 'exp', Db::raw("FIND_IN_SET({$post['type']},type)")];
+        if ($post['type'] !== '') $condition[] = ['type', '=', $post['type']];
 
         //兼容原有各个接口的筛选
         $count = Db::name('headquarters')
@@ -345,12 +346,12 @@ class Headquarters extends BaseController
             ->whereIn('code', $companyNo)
             ->column('name', 'code');
 
-        $res_2 = Db::name('headquarters')
-            ->where('is_del', 0)
-            ->whereIn('relation_code', $companyNo)
-            ->column('name', 'relation_code');
+//        $res_2 = Db::name('headquarters')
+//            ->where('is_del', 0)
+//            ->whereIn('relation_code', $companyNo)
+//            ->column('name', 'relation_code');
 
-        return json_show(0, '请求成功', array_merge($res_1, $res_2));
+        return json_show(0, '请求成功', $res_1);
     }
 
 
@@ -810,6 +811,10 @@ class Headquarters extends BaseController
                     'updatetime' => $date,
                 ]);
 
+            $temp_supplier = Db::name('headquarters')
+                ->where(['code' => $post['code'], 'type' => 3])
+                ->findOrEmpty();
+
             //汇总表
             Db::name('headquarters')
                 ->where(['code' => $post['code'], 'type' => 3])
@@ -821,29 +826,12 @@ class Headquarters extends BaseController
                 ]);
 
             Db::name('headquarters')
-                ->insert([
+                ->insert(array_merge($temp_supplier, [
+                    'id'=>null,
                     'code' => $business_code,
-                    'name' => $res['name'],
                     'type' => 1,//业务公司
-                    'company_type' => $temp['id'] ?? 0,
-                    'invoice_title' => $res['invoice_title'],
-                    'invoice_people' => $res['invoice_people'],
-                    'invoice_addr' => $post['inv_addr'],
-                    'invoice_mobile' => $post['mobile'],
-                    'invoice_code' => $res['invoice_code'],
-                    'invoice_bank' => $post['inv_bank'],
-                    'invoice_bankNo' => $post['inv_bankNo'],
-                    'invoice_img' => $res['invoice_img'],
-                    'status' => $res['status'],
-                    'is_del' => $res['is_del'],
-                    'creater' => $post['uname'],
-                    'createrid' => $post['uid'],
-                    'addtime' => $date,
-                    'updater' => $post['uname'],
-                    'updaterid' => $post['uid'],
-                    'updatetime' => $date,
-                    'relation_code' => $post['code']
-                ]);
+                    'relation_code'=> $post['code']
+                ]));
 
             //供应商
             Db::name('supplier')
@@ -875,17 +863,20 @@ class Headquarters extends BaseController
     }
 
     //获取业务公司列表(为了采销临时脚本同步数据到结算平台使用，正式上线要删除)
-    public function getBusinessListTmp(){
+    public function getBusinessListTmp()
+    {
 
-        $where = $this->request->filter('trim')->post('where',[]);
+        $where = $this->request->filter('trim')->post('where', []);
 
         $list = Db::name('business')
+            ->alias('a')
+            ->field('a.*,b.code as supplierNo')
+            ->leftJoin('headquarters b','b.relation_code=a.companyNo')
             ->where($where)
             ->select()
             ->toArray();
-        return json_show(0,'获取成功',$list);
+        return json_show(0, '获取成功', $list);
 
     }
 
-
 }