后台-推荐人/节点人/身份修改-1.取消了被修改人手机号和昵称展示,2.修改后的推荐人节点人不展示uid改为展示手机号,3.根据不同adminid和修改内容修改默认备注

app/controller/admin/user/User.php

@@ -815,7 +815,11 @@ class User extends BaseController
     {
         $spread_account = $this->request->param('spread_account');
         $adminId = $this->request->adminId();
-        $mark = $this->getMark($adminId,'spread');
+        $mark = $this->request->param('mark');
+        if (empty($mark)) {
+            $adminInfo = $this->request->adminInfo();
+            $mark = $adminInfo['account'].'修改用户推荐人';
+        }
         $olld_id = Db::name('user')->where('uid', $id)->value('spread_uid')??0;
         if($repository->update_spread($id,$spread_account,$mark,$olld_id,$adminId)){
             return app('json')->success("修改成功");
@@ -852,7 +856,11 @@ class User extends BaseController
         $level_account_old = $this->request->param('level_account_old');
         $account = explode('(', $level_account_old)[0];
         $adminId = $this->request->adminId();
-        $mark = $this->getMark($adminId,'level');
+        $mark = $this->request->param('mark');
+        if (empty($mark)) {
+            $adminInfo = $this->request->adminInfo();
+            $mark = $adminInfo['account'].'修改用户节点人';
+        }
         if (!$id) {
             return app('json')->fail("参数丢失");
         }
@@ -878,7 +886,11 @@ class User extends BaseController
         $old_identity_id = $this->request->param('old_identity_id');
         $new_identity_id = $this->request->param('new_identity_id');
         $adminId = $this->request->adminId();
-        $mark = $this->getMark($adminId,'identity');
+        $mark = $this->request->param('mark');
+        if (empty($mark)) {
+            $adminInfo = $this->request->adminInfo();
+            $mark = $adminInfo['account'].'修改用户身份';
+        }
         if (empty($id) || empty($old_identity_id) || empty($new_identity_id)) {
             return app('json')->fail("参数丢失");
         }
@@ -2100,47 +2112,4 @@ class User extends BaseController
             ->toArray();
         return app('json')->success($query, '获取成功');
     }
-    /**
-     * 通过后台管理员id和修改信息来区别默认备注
-     */
-    protected function getMark($adminId, string $type)
-    {
-        $mark = $this->request->param('mark');
-        if ($mark) {
-            return $mark;
-        }
-        $defaultMap = [
-            'spread'   => '后台管理员修改用户推荐人',
-            'level'     => '后台管理员修改用户节点人',
-            'identity' => '后台管理员修改用户身份',
-        ];
-        $markMap = [
-            'spread' => [
-                1 => 'admin修改用户推荐人',
-                10 => '商户+文章管理员修改用户推荐人',
-                25 => '运营管理员修改用户推荐人',
-                27 => '订单发货管理员修改用户推荐人',
-                28 => '财务管理员修改用户推荐人',
-                29 => '超级管理员修改用户推荐人',
-            ],
-            'level' => [
-                1 => 'admin修改用户节点人',
-                10 => '商户+文章管理员修改用户节点人',
-                25 => '运营管理员修改用户节点人',
-                27 => '订单发货管理员修改用户节点人',
-                28 => '财务管理员修改用户节点人',
-                29 => '超级管理员修改用户节点人',
-            ],
-            'identity' => [
-                1 => 'admin修改用户身份',
-                10 => '商户+文章管理员修改用户身份',
-                25 => '运营管理员修改用户身份',
-                27 => '订单发货管理员修改用户身份',
-                28 => '财务管理员修改用户身份',
-                29 => '超级管理员修改用户身份',
-            ]
-        ];
-        return $markMap[$type][$adminId] ?? ($defaultMap[$type] ?? '哈基米修改用户信息');
-    }
-
 }