Merge branch 'master' of github.com:easysoft/zentaopms

2016-10-11 10:02:12 +08:00
parent 3dd56d8fce 8a604e4ebd
commit 85e635b028
1 changed files with 4 additions and 12 deletions
@@ -968,18 +968,10 @@ class userModel extends model
     */
    public function getDataInJSON($user)
    {
-        $data                   = array();
-        $data['user']           = new stdclass();
-        $data['user']->id       = $user->id;
-        $data['user']->account  = $user->account;
-        $data['user']->email    = $user->email;
-        $data['user']->realname = $user->realname;
-        $data['user']->gender   = $user->gender;
-        $data['user']->dept     = $user->dept;
-        $data['user']->role     = $user->role;
-        $data['user']->company  = $this->app->company->name;
-
-        return $data;
+        unset($user->password);
+        unset($user->deleted);
+        $user->company = $this->app->company->name;
+        return array('user' => $user);
    }

    /**