Merge branch 'dev' into dev-sxb

app/common/repositories/user/UserRepository.php

@@ -846,9 +846,9 @@ class UserRepository extends BaseRepository
     {
         $spreadId = Db::name('user')->where('uid', $id)->value('spread_uid');
         if ($spreadId) {
-            $spread_message = Db::name('user')->where('uid', $spreadId)->field('uid,account,nickname')->findOrEmpty();
+            $spread_message = Db::name('user')->where('uid', $spreadId)->field('account,nickname')->findOrEmpty();
         } else {
-            $spread_message = ['uid' => null, 'account' => '无推荐人', 'nickname' => '无推荐人'];
+            $spread_message = ['account' => '无推荐人', 'nickname' => '无推荐人'];
         }
         return Elm::createForm(Route::buildUrl('systemUserChangePro', compact('id'))->build(), [
             Elm::input('spread_account_old', '原推荐人')->value($spread_message['account'].'('.$spread_message['nickname'].')')->disabled(true),
@@ -867,12 +867,12 @@ class UserRepository extends BaseRepository
     {
         $levelId = Db::name('user')->where('uid', $id)->value('level_id');
         if ($levelId) {
-            $level_message = Db::name('user')->where('uid', $levelId)->field('uid,account,nickname')->findOrEmpty();
+            $level_message = Db::name('user')->where('uid', $levelId)->field('account,nickname')->findOrEmpty();
         } else {
-            $level_message = ['uid' => null, 'account' => '无节点人', 'nickname' => '无节点人'];
+            $level_message = ['account' => '无节点人', 'nickname' => '无节点人'];
         }
         return Elm::createForm(Route::buildUrl('systemUserChangeLevelPro', compact('id'))->build(), [
-            Elm::input('spread_account_old', '原推荐人')->value($level_message['account'].'('.$level_message['nickname'].')')->disabled(true),
+            Elm::input('spread_account_old', '原节点人')->value($level_message['account'].'('.$level_message['nickname'].')')->disabled(true),
             Elm::input('level_account', '节点人（上级）')->required()->placeholder("请填写节点人（上级）手机号")
         ])->setTitle('修改用户节点人（上级）');
     }