Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into dev

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Aside;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Enums\Common\Common;
 use App\Enums\Common\Common;
 use App\Http\Controllers\Controller;
 use App\Http\Controllers\Controller;
+use App\Models\User\User as UserModel;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 use Illuminate\Http\Exceptions\HttpResponseException;
 use Illuminate\Http\Exceptions\HttpResponseException;
@@ -160,6 +161,12 @@ class BaseController extends Controller
                     case 'image':
                     case 'image':
                         $v['image_link'] = url('/a/image/' . $v);
                         $v['image_link'] = url('/a/image/' . $v);
                         break;
                         break;
+                    case 'operator_id':
+                        if(!empty($v)){
+                            $name = (new UserModel())->read(['id'=>$v],['id','name']);
+                            $data['operator_name'] = (isset($name['name']) && !empty($name['name'])) ? $name['name'] : '无名称';
+                        }
+                        break;
                 }
                 }
             }
             }
         }
         }

@@ -17,11 +17,13 @@ use Illuminate\Http\Request;
  */
  */
 class ProjectUserController extends BaseController
 class ProjectUserController extends BaseController
 {
 {
+
     /**
     /**
-     * @name :用户列表
-     * @return void
-     * @author :liyuhang
-     * @method
+     * @remark :用户列表
+     * @name   :lists
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/25 9:27
      */
      */
     public function lists(){
     public function lists(){
         $userModel = new UserModel();
         $userModel = new UserModel();
@@ -31,10 +33,12 @@ class ProjectUserController extends BaseController
     }
     }
 
 
     /**
     /**
-     * @name :详情
-     * @return void
-     * @author :liyuhang
-     * @method
+     * @param UserLogic $userLogic
+     * @remark :用户详情
+     * @name   :info
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/25 9:27
      */
      */
     public function info(UserLogic $userLogic){
     public function info(UserLogic $userLogic){
         $this->request->validate([
         $this->request->validate([
@@ -42,14 +46,18 @@ class ProjectUserController extends BaseController
         ],[
         ],[
             'id.required' => 'ID不能为空'
             'id.required' => 'ID不能为空'
         ]);
         ]);
-        $userLogic->user_info();
-        $this->response('success');
+        $info = $userLogic->user_info();
+        $this->response('success',Code::SUCCESS,$info);
     }
     }
+
     /**
     /**
-     * @name :添加用户
-     * @return void
-     * @author :liyuhang
-     * @method
+     * @param UserRequest $request
+     * @param UserLogic $userLogic
+     * @remark :添加用户
+     * @name   :add
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/25 9:27
      */
      */
     public function add(UserRequest $request,UserLogic $userLogic){
     public function add(UserRequest $request,UserLogic $userLogic){
         $request->validated();
         $request->validated();
@@ -58,10 +66,13 @@ class ProjectUserController extends BaseController
     }
     }
 
 
     /**
     /**
-     * @name : 编辑
-     * @return void
-     * @author :liyuhang
-     * @method
+     * @param UserRequest $request
+     * @param UserLogic $userLogic
+     * @remark :编辑用户
+     * @name   :edit
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/25 9:28
      */
      */
     public function edit(UserRequest $request,UserLogic $userLogic){
     public function edit(UserRequest $request,UserLogic $userLogic){
         $request->validate([
         $request->validate([
@@ -74,10 +85,12 @@ class ProjectUserController extends BaseController
     }
     }
 
 
     /**
     /**
-     * @name :批量删除
-     * @return void
-     * @author :liyuhang
-     * @method
+     * @param UserLogic $userLogic
+     * @remark :编辑用户
+     * @name   :del
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/25 9:28
      */
      */
     public function del(UserLogic $userLogic){
     public function del(UserLogic $userLogic){
         $this->request->validate([
         $this->request->validate([

@@ -22,7 +22,7 @@ class UserLogic extends BaseLogic
      * @method
      * @method
      */
      */
     public function user_info(){
     public function user_info(){
-        $info = $this->model->read($this->param);
+        $info = $this->model->read($this->param,['id','project_id','name','status','mobile','operator_id']);
         if($info === false){
         if($info === false){
             $this->fail('当前数据不存在');
             $this->fail('当前数据不存在');
         }
         }

@@ -107,7 +107,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/del', [Aside\Project\ProjectGscController::class, 'del'])->name('admin.del');
         Route::any('/del', [Aside\Project\ProjectGscController::class, 'del'])->name('admin.del');
     });
     });
 
 
-    //优化gsc账号记录表
+    //gsc账号审核
     Route::prefix('optimize')->group(function () {
     Route::prefix('optimize')->group(function () {
         Route::any('/empowerDomain', [Aside\Project\OptimizeController::class, 'empowerDomain'])->name('admin.empowerDomain');
         Route::any('/empowerDomain', [Aside\Project\OptimizeController::class, 'empowerDomain'])->name('admin.empowerDomain');
     });
     });