添加供应商账号，分类关联规格修改优化，细节优化

.env

@@ -1 +1 @@
-APP_DEBUG = true
[APP]
DEFAULT_TIMEZONE = Asia/Shanghai


[LANG]
default_lang = zh-cn

[USER]
hosturl=http://user.test241.wanyuhengtong.com/
+APP_DEBUG = true

default_admin_addcount_role_id = 1
default_supplier_addcount_role_id = 90


[APP]
DEFAULT_TIMEZONE = Asia/Shanghai


[LANG]
default_lang = zh-cn

[USER]
hosturl=http://user.test241.wanyuhengtong.com/

app/admin/controller/Cat.php

@@ -413,7 +413,7 @@ class Cat extends Base
                 $st = array_diff($db, $specs_id);
                 if (!empty($st)) {
                     $int['is_del'] = 1;
-                    $dn = Db::name('cat_specs')->where(['specs_id' => $st, 'is_del' => 0])->save($int);
+                    $dn = Db::name('cat_specs')->where(['cat_id' => $idinfo['id'], 'specs_id' => $st, 'is_del' => 0])->save($int);
                     if ($dn == false) {
                         Db::rollback();
                         return error_show(1002, '编辑失败');

app/admin/controller/Supplier.php

@@ -205,6 +205,7 @@ public function selec(){
         $rs = $userCommon->handle('hqList', [
             'code' => $post['companyNo'],
             'name'=>$post['name'],
+            'type'=>$post['type'],
             'page'=>$post['page'],
             'size'=>$post['size'],
             'level'=>$this->level,

app/admin/controller/User.php

@@ -29,35 +29,74 @@ class User extends Base
         $rs = json_decode($rs, true);
 
         if (!isset($rs['code']) || $rs['code'] != 0) return json_show(1004, $rs['message']);
-        
-        if ($rs['data']['level'] == 1) {
-            //超管
-            $data = array_merge($rs['data'], [
-                'role_name' => '',
-                'role_level' => $rs['data']['level'] ?? '',
-                'role_id' => '',
-            ]);
 
-        } else {
 
-            $role = Db::name('user_role')
-                ->where(['uid' => $rs['data']['id'], 'is_main' => 1, 'is_del' => 0])
-                ->findOrEmpty();
+        switch ($rs['data']['level']){
+            case 1:
+                $role = [
+                    'role_name' => '',
+                    'role_level' => $rs['data']['level'],
+                    'role_id' => env('default_admin_addcount_role_id',1),//指定一个默认角色id,1超管
+                ];
+                break;
+
+            case 2:
+                $role = Db::name('user_role')
+                    ->alias('a')
+                    ->field('a.roleid role_id,b.role_name,b.role_level')
+                    ->leftJoin('role b', 'b.id=a.roleid')
+                    ->where(['a.uid' => $rs['data']['id'], 'a.is_main' => 1, 'a.is_del' => 0])
+                    ->findOrEmpty();
+
+                if (empty($role)) return json_show(1004, '没有默认角色，无法登录，请联系管理员');
+                break;
+
+            case 3:
+                //供应商端
+                $role = [
+                    'role_name' => '',
+                    'role_level' => $rs['data']['level'],
+                    'role_id' => env('default_supplier_addcount_role_id',90),//指定一个默认角色id
+                ];
+                break;
 
-            if (empty($role)) return json_show(1004, '没有默认角色，无法登录，请联系管理员');
+        }
 
-            $roleinfo = Db::name('role')
-                ->where(['id' => $role['roleid']])
-                ->field('role_name')
-                ->find();
 
-            //数据合并
-            $data = array_merge($rs['data'], [
-                'role_name' => $roleinfo['role_name'] ?? '',
-                'role_level' => $rs['data']['level'] ?? '',
-                'role_id' => $role['roleid'] ?? '',
-            ]);
-        }
+
+//        if ($rs['data']['level'] == 2) {
+//
+//            $role = Db::name('user_role')
+//                ->alias('a')
+//                ->field('a.roleid,b.role_name,b.role_level')
+//                ->leftJoin('role b', 'b.id=a.roleid')
+//                ->where(['a.uid' => $rs['data']['id'], 'a.is_main' => 1, 'a.is_del' => 0])
+//                ->findOrEmpty();
+//
+//            if (empty($role)) return json_show(1004, '没有默认角色，无法登录，请联系管理员');
+//
+//            //数据合并
+//            $data = array_merge($rs['data'], [
+//                'role_name' => $role['role_name'],
+//                'role_level' => $role['role_level'],
+//                'role_id' => $role['roleid'],
+//            ]);
+//
+//        } else {
+//            //超管 or 供应商
+//            $data = array_merge($rs['data'], [
+//                'role_name' => '',
+//                'role_level' => $rs['data']['level'],
+//                'role_id' => '',
+//            ]);
+//        }
+
+        $data = array_merge($rs['data'], [
+            'role_name' => $role['role_name'],
+            'role_level' => $role['role_level'],
+            'role_id' => $role['role_id'],
+        ]);
+
 
         return json_show(0, '登录成功', $data);