Merge branch 'master' of http://gogs.renlianiot.com:4000/zmcoding/smart-tool-api

catch/permissions/controller/Role.php

@@ -76,17 +76,17 @@ class Role extends CatchController
             Db::rollback();
             return CatchResponse::fail('保存权限失败');
         }
-        // 追加角色
-        if ($params['identify'] != 'admin' && $params['identify'] != 'manage') {
-            $user = request()->user();
-            $save_data = ['uid'=>$user['id'], 'role_id'=>$role_id];
-            try {
-                Db::table('user_has_roles')->save($save_data);
-            } catch (\Exception $e) {
-                Db::rollback();
-                return CatchResponse::fail('保存失败');
-            }
-        }
+        // 追加角色 暂时关闭
+        // if ($params['identify'] != 'admin' && $params['identify'] != 'manage') {
+        //     $user = request()->user();
+        //     $save_data = ['uid'=>$user['id'], 'role_id'=>$role_id];
+        //     try {
+        //         Db::table('user_has_roles')->save($save_data);
+        //     } catch (\Exception $e) {
+        //         Db::rollback();
+        //         return CatchResponse::fail('保存失败');
+        //     }
+        // }
         Db::commit();
         return CatchResponse::success('保存成功');
     }