后台-修改用户身份-(beta)用户身份

app/common/repositories/user/UserRepository.php

@@ -869,11 +869,20 @@ class UserRepository extends BaseRepository
 
     public function changeProFormGroup($id)
     {
+        $userGroup = Db::name('user')->where('uid', $id)->where('is_del', '!=', 1)->value('user_group');
         $identityList = Db::name('user_identity')->field('user_group_name label,user_group_id value')->select()->toArray();
-
+        $oldIdentity = [];
+        foreach ($identityList as $item) {
+            if ($item['value'] == $userGroup) {
+                $oldIdentity = $item;
+                break;
+            }
+        }
         return Elm::createForm(Route::buildUrl('systemUserChangeGroupPro', compact('id'))->build(), [
-            Elm::select('group_id', '新的用户身份')->options($identityList)
-        ],[Elm::input('mark', '备注')->placeholder("请填写备注信息")])->setTitle('修改用户身份');
+            Elm::select('old_identity_id', '当前用户身份')->options([$oldIdentity])->value($oldIdentity['value'])->disabled(true),
+            Elm::select('new_identity_id', '新的用户身份')->options($identityList),
+            Elm::textarea('mark', '备注', '')->required()->placeholder('请填写备注信息')
+        ])->setTitle('修改用户身份');
     }
 
     /**
@@ -3152,7 +3161,7 @@ class UserRepository extends BaseRepository
     public function update_user_group($id,$group_id,$adminid,$mark)
     {
         try {
-            Db::name("user_group_record")->insert(['adminid' => $adminid,'uid' => $id,'mark' => $mark]);
+            Db::name("user_group_record")->insert(['admin_id' => $adminid,'uid' => $id,'mark' => $mark]);
             return Db::name("user")->where("uid", $id)->update(['user_group' => $group_id]);
         } catch (\Exception $e) {
             return false;

app/controller/admin/user/User.php

@@ -865,7 +865,7 @@ class User extends BaseController
         if (!$this->repository->exists($id))
             return app('json')->fail('数据不存在');
         $formData = formToData($this->repository->changeProFormGroup($id));
-        return app('json')->success(array_merge($formData));
+        return app('json')->success($formData);
     }
     public function changeProGroup($id,UserRepository $repository)
     {