afa 4 місяців тому
батько
коміт
b4f4c46347

+ 1 - 1
application/admin/controller/user/Airdrop.php

@@ -26,7 +26,7 @@ class Airdrop extends Backend
      * @var \app\admin\model\user\Airdrop
      */
     protected $model = null;
-
+    protected $relationSearch = true;
     public function _initialize()
     {
         parent::_initialize();

+ 2 - 2
application/api/controller/User.php

@@ -147,8 +147,8 @@ class User extends Api
             //手机号修改
             if(isset($param['phone']) && UserInfoLogic::checkUserByInfo('phone', $this->auth->id, $param['phone']) == false) $this->error(__("手机号已存在"));
 
-            //地址时候去重 area_code
-            if(isset($param['address']) && UserInfoLogic::checkUserByInfo('address', $this->auth->id, $param['address']) == false) $this->error(__("钱包地址已存在不能修改"));
+            //地址时候去重 
+            if(!isset($param['area_code']) && isset($param['address']) && UserInfoLogic::checkUserByInfo('address', $this->auth->id, $param['address']) == false) $this->error(__("钱包地址已存在不能修改"));
 
             if(isset($param['area_code']) && isset($param['area_name'])){
                 $resp = $userArea::setUserAddress($this->auth->id, $param['area_code'], $param['area_name']);