Merge branch 'dev-xpy' into dev

app/controller/admin/user/User.php

@@ -839,23 +839,32 @@ class User extends BaseController
      */
     public function changeProLevelForm($id)
     {
-        if (!$this->repository->exists($id))
+        if (!$this->repository->exists($id)) {
             return app('json')->fail('数据不存在');
-
+        }
         $groupId = Db::name("user")->where('uid', $id)->value("group_id");
-        if ($groupId) {$level_message = Db::name("user")->where('uid', $groupId)->field("uid,account,nickname")->find();
+
+        if ($groupId) {
+            $level_message = Db::name("user")
+                ->where('uid', $groupId)
+                ->field("uid,account,nickname")
+                ->find();
         } else {
             $level_message = ['uid' => null, 'account' => '无节点人', 'nickname' => '无节点人'];
         }
         $formData = formToData($this->repository->changeProFormLevel($id));
-        foreach ($formData['rule'] as &$rule) {
-            if ($rule['field'] === 'level_account') {
-                $rule['value'] = $level_message['account'] ?? '';
+        if (!empty($formData['rule']) && is_array($formData['rule'])) {
+            foreach ($formData['rule'] as &$rule) {
+                if ($rule['field'] === 'level_account') {
+                    $rule['value'] = $level_message['account'] ?? '无节点人';
+                }
             }
         }
+
         return app('json')->success($formData);
     }
 
+
     /*
      * 更改用户节点人信息
      * cabbage