bug优化，新增设置账号业务平台的功能

app/admin/controller/Menu.php

@@ -105,7 +105,12 @@ class Menu extends Base
 
         }
 
-        if (isset($post['level']) && $post['level'] !== '' && $post['level'] != 1) $where[] = ['blevel', 'in', [0, $post['level']]];
+//        if (isset($post['level']) && $post['level'] !== '' && $post['level'] != 1) $where[] = ['blevel', 'in', [0, $post['level']]];
+        if (isset($post['level']) && $post['level'] !== '') $where[] = ['blevel', 'in', [0, $post['level']]];
+        else {
+            if ($this->level == 1) $where[] = ['blevel', 'in', [0, 1, 2]];
+            else $where[] = ['blevel', 'in', [0, $this->level]];
+        }
 
 //        if (empty($role['action_conllect'])) {
 //            return app_show(0, "获取成功", []);

app/admin/controller/Purch.php

@@ -201,7 +201,7 @@ class Purch extends Base
          }
 
         //补充供应商负责人(sip.personid as supplier_cgderid,sip.person as supplier_cgder)
-        $person_list = $userCommon->handle('sGetList', ['code' => array_unique(array_column($list, 'supplierNo')), 'size' => $size]);
+        $person_list = $userCommon->handle('sGetList', ['more_code' => array_unique(array_column($list, 'supplierNo')), 'size' => $size]);
         $person_list = array_column($person_list['data']['list'], null, 'code');
 
         foreach ($list as $value){
@@ -225,6 +225,10 @@ class Purch extends Base
             if($value['order_type']==3){
                 $goon = Db::name("good_zixun")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->find();
                 $value["speclist"]=isset($goon['specinfo'])&&$goon['specinfo']!=""? json_decode($goon['specinfo'],true):"";
+                //为了格式统一，缺了一个spec_value
+                foreach ($value['speclist'] as &$v) {
+                    $v['spec_value'] = $v['spec_value_name'];
+                }
             }else {
                 $goon =Db::name('good_basic')->where(['spuCode'=>$value['spuCode']])->find();
                 $spec = Db::name("good_spec")->where(["spuCode"=>$goon['spuCode'],"is_del"=>0])->select()->toArray();

app/admin/controller/Sale.php

@@ -6,8 +6,10 @@ use app\abutment\model\SupplierRelationUser;
 use app\abutment\model\SupplierUser;
 use app\admin\model\DataGroup as DataGroupModel;
 use app\admin\model\GoodLog;
-use app\admin\model\GoodStockInfo;use app\admin\model\ProcessOrder;
-use app\admin\model\SaleInfo;use Exception;
+use app\admin\model\GoodStockInfo;
+use app\admin\model\ProcessOrder;
+use app\admin\model\SaleInfo;
+use Exception;
 use think\App;
 use think\facade\Cache;
 use think\facade\Config;

app/admin/controller/UserCompanyBasic.php

@@ -148,8 +148,73 @@ class UserCompanyBasic extends Base
 
         $rs = $userCommon->handle('userCompanyBasicInfo', $param);
 
+        $user_platform = [];
+
+        if (isset($rs['code']) && $rs['code'] == 0) {
+            $user_platform_id = Db::name('user_platform')
+                ->field('platform')
+                ->where(['uid' => $param['id'], 'is_del' => 0])
+                ->buildSql();
+
+            $user_platform = Db::name('platform')
+                ->field('id,platform_code,platform_name')
+                ->where('is_del', 0)
+                ->where('id IN ' . $user_platform_id)
+                ->select()
+                ->toArray();
+        }
+
+        $rs['data']['platform'] = $user_platform;
+
         return json_show($rs['code'], $rs['message'], $rs['data']);
     }
 
+    //设置账号关联的平台
+    public function setUserPlatfrom()
+    {
+        $param = $this->request->only(['uid', 'platform_id'], 'post', 'trim');
+
+        $val = Validate::rule([
+            'uid|用户ID' => 'require|number|gt:0',
+            'platform_id|平台id集合' => 'require|array|max:9999'
+        ]);
+
+        if ($val->check($param) == false) return json_show(1004, $val->getError());
+
+        $platform_id = Db::name('platform')
+            ->where(['is_del' => 0, 'status' => 1, 'id' => $param['platform_id']])
+            ->column('id');
+
+        if (empty($platform_id)) return json_show(1004, $val->getError());
+
+        $tmp = Db::name('user_platform')
+            ->field('id')
+            ->where(['is_del' => 0, 'uid' => $param['uid']])
+            ->findOrEmpty();
+
+        $date = date('Y-m-d H:i:s');
+
+        if (empty($tmp)) {
+            $res = Db::name('user_platform')
+                ->insert([
+                    'uid' => $param['uid'],
+                    'platform' => implode(',', $platform_id),
+                    'is_del' => 0,
+                    'addtime' => $date,
+                    'updatetime' => $date,
+                ]);
+        } else {
+            $res = Db::name('user_platform')
+                ->where(['is_del' => 0, 'id' => $tmp['id']])
+                ->update([
+                    'platform' => implode(',', $platform_id),
+                    'updatetime' => $date,
+                ]);
+        }
+
+        return $res ? json_show(0, '操作成功') : json_show(1004, '操作失败');
+
+    }
+
 
 }

app/admin/model/ProcessWait.php

@@ -2,8 +2,8 @@
 
 namespace app\admin\model;
 
-//use app\abutment\model\SupplierRelationUser as SupplierRelationUserModel;
-//use app\abutment\model\SupplierUser as SupplierUserModel;
+use app\abutment\model\SupplierRelationUser as SupplierRelationUserModel;
+use app\abutment\model\SupplierUser as SupplierUserModel;
 use think\facade\Db;
 use think\Model;
 

app/admin/route/app.php

@@ -157,6 +157,7 @@ Route::rule('userCompanyBasicUpdate', 'admin/UserCompanyBasic/update');
 Route::rule('userCompanyBasicStatus', 'admin/UserCompanyBasic/status');
 Route::rule('userCompanyBasicPassword', 'admin/UserCompanyBasic/password');
 Route::rule('userCompanyBasicInfo', 'admin/UserCompanyBasic/info');
+Route::rule('setUserPlatfrom', 'admin/UserCompanyBasic/setUserPlatfrom');
 //【公司账号查询】
 Route::rule('userCompanyList', 'admin/UserCompany/getList');
 Route::rule('userCompanyInfo', 'admin/UserCompany/info');