超管后台 - 编辑项目显示详情

Server/application/superadmin/config/route.php

@@ -36,6 +36,6 @@ Route::group('', function () {
     Route::group('company', function () {
         Route::post('create', 'app\superadmin\controller\company\CreateCompanyController@index');
         Route::get('list', 'app\superadmin\controller\CompanyController@getList');
-        Route::get('detail/:id', 'app\superadmin\controller\CompanyController@getDetail');
+        Route::get('detail/:id', 'app\superadmin\controller\company\GetCompanyDetailForUpdateController@index');
     });
 })->middleware(['app\superadmin\middleware\AdminAuth']); 

Server/application/superadmin/controller/company/CreateCompanyController.php

@@ -24,7 +24,7 @@ class CreateCompanyController extends BaseController
      */
     protected function s2CreateDepartment(array $params): ?array
     {
-        $params = ArrHelper::getValue('name=departmentName,memo=departmentMemo,account=accountName,password=accountPassword,realName=accountRealName,nickname=accountNickname,accountMemo', $params);
+        $params = ArrHelper::getValue('name=departmentName,memo=departmentMemo,account=accountName,password=accountPassword,realName=accountRealName,username=accountNickname,accountMemo', $params);
 
         // 创建公司部门
         $response = CurlHandle::getInstant()
@@ -52,7 +52,7 @@ class CreateCompanyController extends BaseController
     {
         $validate = Validate::make([
             'name' => 'require|max:50|/\S+/',
-            'nickname' => 'require|max:20|/\S+/',
+            'username' => 'require|max:20|/\S+/',
             'account' => 'require|regex:/^1[3-9]\d{9}$/',
             'status' => 'require|in:0,1',
             'password' => 'require|/\S+/',
@@ -60,7 +60,7 @@ class CreateCompanyController extends BaseController
             'memo' => '/\S+/',
         ], [
             'name.require' => '请输入项目名称',
-            'nickname.require' => '请输入用户昵称',
+            'username.require' => '请输入用户昵称',
             'account.require' => '请输入账号',
             'account.regex' => '账号为手机号',
             'status.require' => '缺少重要参数',
@@ -123,7 +123,10 @@ class CreateCompanyController extends BaseController
      */
     protected function ckbCreateUser(array $params): void
     {
-        $params = ArrHelper::getValue('nickname=username,account,password=passwordLocal,companyId,s2_accountId,status', $params);
+        $params = ArrHelper::getValue(
+            'username,account,password=passwordLocal,companyId,s2_accountId,status,realName',
+            $params
+        );
 
         $result = UsersModel::create(array_merge($params, [
             'passwordMd5' => md5($params['passwordLocal']),
@@ -158,7 +161,7 @@ class CreateCompanyController extends BaseController
     public function index()
     {
         try {
-            $params = $this->request->only(['name', 'status', 'nickname', 'account', 'password', 'realName', 'memo']);
+            $params = $this->request->only(['name', 'status', 'username', 'account', 'password', 'realName', 'memo']);
             $params = $this->dataValidate($params)->creatS2About($params);
 
             Db::startTrans();

Server/application/superadmin/controller/company/GetCompanyDetailForUpdateController.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace app\superadmin\controller\company;
+
+use app\common\model\Company as CompanyModel;
+use app\superadmin\controller\BaseController;
+
+/**
+ * 公司控制器
+ */
+class GetCompanyDetailForUpdateController extends BaseController
+{
+    /**
+     * 获取下古墓详情
+     *
+     * @param int $id
+     * @return CompanyModel
+     * @throws \Exception
+     */
+    protected function getCompanyDetail(int $id): array
+    {
+        $detail = CompanyModel::alias('c')
+            ->field([
+                'c.id', 'c.name', 'c.status', 'c.memo', 'u.account', 'u.username', 'u.realName',
+            ])
+            ->leftJoin('users u', 'c.companyId = u.companyId')
+            ->find($id);
+
+        if (!$detail) {
+            throw new \Exception('项目不存在', 404);
+        }
+
+        return $detail->toArray();
+    }
+
+    /**
+     * 获取项目详情
+     *
+     * @param int $id
+     * @return \think\response\Json
+     */
+    public function index($id)
+    {
+        try {
+            $data = $this->getCompanyDetail($id);
+
+            return json([
+                'code' => 200,
+                'msg' => '获取成功',
+                'data' => $data
+            ]);
+        } catch (\Exception $e) {
+            return json([
+                'code' => $e->getCode(),
+                'msg' => $e->getMessage()
+            ]);
+        }
+    }
+}