Преглед изворни кода

后台-修改推荐人节点人-(beta)新增展示用户原推荐人和节点人

xupuyuan пре 11 месеци
родитељ
комит
2dd4c392da
1 измењених фајлова са 4 додато и 4 уклоњено
  1. 4 4
      app/controller/admin/user/User.php

+ 4 - 4
app/controller/admin/user/User.php

@@ -805,11 +805,11 @@ class User extends BaseController
805
 
805
 
806
         $spreadId = Db::name('user')->where('uid', $id)->value('spread_uid');
806
         $spreadId = Db::name('user')->where('uid', $id)->value('spread_uid');
807
         if ($spreadId) {
807
         if ($spreadId) {
808
-            $level_message = Db::name('user')->where('uid', $spreadId)->field('uid,account,nickname')->find();
808
+            $spread_message = Db::name('user')->where('uid', $spreadId)->field('uid,account,nickname')->find();
809
         } else {
809
         } else {
810
-            $level_message = ['uid' => null, 'account' => '无节点人', 'nickname' => '无节点人'];
810
+            $spread_message = ['uid' => null, 'account' => '无节点人', 'nickname' => '无节点人'];
811
         }
811
         }
812
-        return app('json')->success(['form' => $formData, 'level_message' => $level_message]);
812
+        return app('json')->success(array_merge($formData,['spread_message' => $spread_message]));
813
     }
813
     }
814
 
814
 
815
 
815
 
@@ -848,7 +848,7 @@ class User extends BaseController
848
         } else {
848
         } else {
849
             $level_message = ['uid' => null, 'account' => '无节点人', 'nickname' => '无节点人'];
849
             $level_message = ['uid' => null, 'account' => '无节点人', 'nickname' => '无节点人'];
850
         }
850
         }
851
-        return app('json')->success(['form' => $formData, 'level_message' => $level_message]);
851
+        return app('json')->success(array_merge($formData, ['level_message' => $level_message]));
852
     }
852
     }
853
 
853
 
854
 
854