Merge branch 'dev' into dev-sxb

app/common/repositories/user/UserRepository.php

@@ -879,9 +879,20 @@ class UserRepository extends BaseRepository
 
     public function changeProFormGroup($id)
     {
-        return Elm::createForm(Route::buildUrl('systemUserChangeusergroupPro', compact('id'))->build(), [
-            Elm::input('group_id', '新的用户身份')->required()->placeholder("请填写新的用户身份")
-        ],[Elm::input('mark', '备注')->placeholder("请填写备注信息")])->setTitle('修改用户身份');
+        $userGroup = Db::name('user')->where('uid', $id)->where('is_del', '=', 0)->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('old_identity_id', '当前用户身份')->options([$oldIdentity])->value($oldIdentity['value'])->disabled(true),
+            Elm::select('new_identity_id', '新的用户身份')->options($identityList),
+            Elm::textarea('mark', '备注', '')->required()->placeholder('请填写备注信息')
+        ])->setTitle('修改用户身份');
     }
 
     /**
@@ -3157,11 +3168,17 @@ class UserRepository extends BaseRepository
 
     }
 
-    public function update_user_group($id,$group_id,$adminid,$mark)
+    public function update_user_group($id, $old_identity_id, $new_identity_id, $adminid, $mark)
     {
         try {
-            Db::name("user_group_record")->insert(['adminid' => $adminid,'uid' => $id,'mark' => $mark]);
-            return Db::name("user")->where("uid", $id)->update(['user_group' => $group_id]);
+            Db::name("user_identity_change_records")->insert([
+                'operation_id' => $adminid,
+                'uid' => $id,
+                'old_identity_id' => $old_identity_id,
+                'new_identity_id' => $new_identity_id,
+                'mark' => $mark
+            ]);
+            return Db::name("user")->where("uid", $id)->update(['user_group' => $new_identity_id]);
         } catch (\Exception $e) {
             return false;
         }

app/controller/admin/user/User.php

@@ -53,7 +53,6 @@ class User extends BaseController
      * @var UserRepository
      */
     protected $repository;
-    private $request;
 
     /**
      * User constructor.
@@ -866,17 +865,18 @@ 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)
     {
-        $group_id = $this->request->param('group_id');
         $adminid = $this->request->adminId();
+        $old_identity_id = $this->request->param('old_identity_id');
+        $new_identity_id = $this->request->param('new_identity_id');
         $mark = $this->request->param('mark');
-        if (!$id) {
+        if (empty($id) || empty($old_identity_id) || empty($new_identity_id)) {
             return app('json')->fail("参数丢失");
         }
-        if ($repository->update_user_group($id, $group_id,$adminid,$mark)) {
+        if ($repository->update_user_group($id, $old_identity_id, $new_identity_id, $adminid, $mark)) {
             return app('json')->success("修改成功");
         } else {
             return app('json')->fail("失败");
@@ -2026,5 +2026,11 @@ class User extends BaseController
             ->toArray();
         return app('json')->success($records, '获取成功');
     }
+    /**
+     * 查询用户上下级
+     */
+    public function getusersxj(){
+
+    }
 
 }