Merge remote-tracking branch 'origin/develop' into akun

@@ -145,10 +145,8 @@ class OnlineController extends BaseController
     public function setQuestion(){
         $this->request->validate([
             'id'=>'required',
-            'question'=>'required'
         ],[
             'id.required' => 'ID不能为空',
-            'question.required' => 'question不能为空'
         ]);
         $onlineCheckModel = new OnlineCheck();
         $rs = $onlineCheckModel->edit($this->param,['id'=>$this->param['id']]);

@@ -9,6 +9,7 @@ use App\Models\ASide\APublicModel;
 use App\Models\Channel\Channel;
 use App\Models\Domain\DomainInfo;
 use App\Models\Manage\Manage;
+use App\Models\Project\OnlineCheck;
 use App\Models\Project\Project;
 use App\Models\Task\Task;
 use Illuminate\Support\Facades\DB;
@@ -73,9 +74,9 @@ class OptimizeController extends BaseController
         $item['product_num'] = $data['product'] ?? 0;
         $item['keyword_num'] = $item['key'] ?? 0;
         $item['autologin_code'] = getAutoLoginCode($item['id']);
-        $item['article_num'] = ($data['blog'] ?? 0) + ($data['news'] ?? 0);
-        $item['task_finish_num'] = Task::getNumByProjectId($item['id'], Task::STATUS_DOWN);
-        $item['task_pending_num'] = Task::getNumByProjectId($item['id'], [Task::STATUS_DONGING, Task::STATUS_WAIT]);
+//        $item['article_num'] = ($data['blog'] ?? 0) + ($data['news'] ?? 0);
+//        $item['task_finish_num'] = Task::getNumByProjectId($item['id'], Task::STATUS_DOWN);
+//        $item['task_pending_num'] = Task::getNumByProjectId($item['id'], [Task::STATUS_DONGING, Task::STATUS_WAIT]);
         return $item;
     }
     /**
@@ -94,8 +95,11 @@ class OptimizeController extends BaseController
             'gl_project.type AS type',
             'gl_project.created_at AS created_at',
             'gl_project.cooperate_date AS cooperate_date',
+            'gl_project.finish_remain_day AS finish_remain_day',
+            'gl_project.remain_day AS remain_day',
             'gl_project_online_check.id AS online_check_id',
             'gl_project_online_check.question AS question',
+            'gl_project_online_check.go_question AS go_question',
             'gl_project_online_check.optimist_status AS optimist_status',
             'gl_project_online_check.qa_status AS qa_status',
             'gl_project_payment.amount AS amount',

@@ -33,7 +33,7 @@ class ProjectUserController extends BaseController
         $query = $userModel->leftJoin('gl_project', 'gl_project_user.project_id', '=', 'gl_project.id')
                             ->leftJoin('gl_project_role', 'gl_project_user.role_id', '=', 'gl_project_role.id');
         $query = $this->searchParam($query);
-        $lists = $query->paginate($this->row, $this->selectParam(), 'page', $this->page);
+        $lists = $query->orderBy('gl_project_user.id', 'desc')->paginate($this->row, $this->selectParam(), 'page', $this->page);
         $this->response('列表',Code::SUCCESS,$lists);
     }
 

@@ -23,6 +23,7 @@ class UserController extends BaseController
     public function lists(UserModel $userModel){
         //TODO::搜索参数统一处理
         $this->map['project_id'] = $this->user['project_id'];
+        $this->map['role_id'] = ['!=',0];
         $lists = $userModel->lists($this->map,$this->page,$this->row,$this->order,['id','name','mobile','created_at','wechat','status']);
         $this->response('success',Code::SUCCESS,$lists);
     }

@@ -42,6 +42,9 @@ class UserLogic extends BaseLogic
         if($info !== false){
             $this->fail('当前手机号码已注册');
         }
+        if(!isset($this->param['role']) || empty($this->param['role'])){
+            $this->fail('一个账号只允许一个超级管理员，请先添加角色');
+        }
         $this->param['create_id'] = $this->user['id'];
         $this->param['operator_id'] = $this->user['id'];
         $this->param['project_id'] = $this->user['project_id'];
@@ -74,7 +77,13 @@ class UserLogic extends BaseLogic
         }
         $this->param['type'] = 1;
         $this->param['operator_id'] = $this->user['id'];
-        $this->edits();
+        if(isset($this->param['password']) && empty($this->param['password'])){
+            $this->param['password'] = base64_encode(md5($this->param['password']));
+        }
+        $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
+        if($rs === false){
+            $this->fail('系统错误，请联系管理员');
+        }
         return $this->success();
     }
 
@@ -107,33 +116,4 @@ class UserLogic extends BaseLogic
         //对应删除组织架构
         return $this->success();
     }
-
-    /**
-     * @param $param
-     * @remark :编辑用户
-     * @name   :edits
-     * @author :lyh
-     * @method :post
-     * @time   :2023/6/17 16:41
-     */
-    public function edits(){
-        if(!isset($this->param['password']) || empty($this->param['password'])){
-            unset($this->param['password']);
-        }else{
-            $this->param['password'] = base64_encode(md5($this->param['password']));
-        }
-        $info = $this->model->read(['mobile'=>$this->param['mobile'],
-            'project_id'=>$this->user['project_id'],'id'=>['!=',$this->param['id']]]);
-        if($info !== false){
-            $this->fail('当前手机号码已注册');
-        }
-        //密码加密
-        $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
-        if($rs === false){
-            $this->fail('系统错误，请联系管理员');
-        }
-        //清空当前用户登录缓存
-        Cache::pull($this->user['token']);
-        return $this->success();
-    }
 }

@@ -23,7 +23,7 @@ class LoginAuthMiddleware
      */
     public function handle(Request $request, Closure $next)
     {
-        $manage = Cache::get(Common::MANAGE_TOKEN . $request->header('token'));
+        $manage = LoginLogic::manage();
         if (!$manage) {
             return response(['code'=> Code::USER_LOGIN_ERROE,'message'=>'当前用户未登录']);
         }