Browse Source

Merge branch 'master' of http://git.dever.cc:3000/dever-package/passport

dever 3 years ago
parent
commit
c816c07376
2 changed files with 4 additions and 2 deletions
  1. 3 1
      lib/Manage.php
  2. 1 1
      src/Address.php

+ 3 - 1
lib/Manage.php

@@ -62,7 +62,9 @@ class Manage
 
         if ($user['profession']) {
             $profession = Dever::db('passport/profession')->one($user['profession']);
-            $table['职业'] = $profession['name'];
+            if ($profession) {
+                $table['职业'] = $profession['name'];
+            }
         }
 
         if ($user['sex']) {

+ 1 - 1
src/Address.php

@@ -47,7 +47,7 @@ class Address  extends Base
 
     private function getInfo($data)
     {
-        $data['address_info'] = $data['add_string'] = $data['address'];
+        $data['address_info'] = $data['add_string'] = $data['address'] . $data['house_number'];
         $data['province_name'] = $data['city_name'] = $data['county_name'] = '';
         if ($data['county']) {