rabin 6 months ago
parent
commit
0f78d8b403
2 changed files with 6 additions and 3 deletions
  1. 2 2
      api/Login.php
  2. 4 1
      lib/Page.php

+ 2 - 2
api/Login.php

@@ -36,8 +36,8 @@ class Login
             $info['partition'] = $system['partition'];
             $info['system_id'] = $system['id'];
             $partition = Dever::load('common', 'manage')->system($info);
-            $db = Dever::db($system['user_table'], '', 'default', $partition);
-            $role_db = Dever::db($system['role_table'], '', 'default', $partition);
+            $db = Dever::db($system['user_table'], '', true, 'default', $partition);
+            $role_db = Dever::db($system['role_table'], '', true, 'default', $partition);
         }
         $where['mobile'] = Dever::input('mobile', Dever::rule('mobile'), '手机号');
         $password = Dever::input('password', 'is_string', '密码');

+ 4 - 1
lib/Page.php

@@ -136,7 +136,10 @@ class Page extends Auth
                 if (isset($this->config['column']['delete'])) {
                     $data['column']['delete'] = array('name' => '删除', 'func' => $this->getFunc('column_delete', $name . '-删除', 103));
                 }
-                $data['column']['data'] = Dever::call($this->config['column']['data']);
+                $data['column']['data'] = $this->config['column']['data'];
+                if (is_string($data['column']['data'])) {
+                    $data['column']['data'] = Dever::call($data['column']['data']);
+                }
                 $data['height'] = '100%';
             }