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

@@ -115,6 +115,7 @@ class ProjectController extends BaseController
             'gl_project_deploy_optimize.design_mid AS design_mid',
             'gl_project_deploy_optimize.design_mid AS design_mid',
             'gl_project_deploy_optimize.api_no AS api_no',
             'gl_project_deploy_optimize.api_no AS api_no',
             'gl_project_deploy_optimize.brand_keyword AS brand_keyword',
             'gl_project_deploy_optimize.brand_keyword AS brand_keyword',
+            'gl_project_deploy_optimize.inquiry_prompt AS inquiry_prompt'
         ];
         ];
         return $select;
         return $select;
     }
     }

@@ -61,7 +61,6 @@ class LoginLogic extends BaseLogic
         //生成新token
         //生成新token
         $token = md5(uniqid().$manage['id']);
         $token = md5(uniqid().$manage['id']);
         unset($manage['password']);
         unset($manage['password']);
-        Cache::add(Common::MANAGE_TOKEN . $token,$manage,3600 * 6);
         //更新用户信息
         //更新用户信息
         $manage->token = $token;
         $manage->token = $token;
         $res = $manage->save();
         $res = $manage->save();
@@ -73,6 +72,7 @@ class LoginLogic extends BaseLogic
         $manage['special'] = $this->getSpecialMenu($manage['id']);
         $manage['special'] = $this->getSpecialMenu($manage['id']);
         //岗位
         //岗位
         $manage['entry_position'] = ManageHr::where('manage_id', $manage['id'])->value('entry_position')?:0;
         $manage['entry_position'] = ManageHr::where('manage_id', $manage['id'])->value('entry_position')?:0;
+        Cache::add(Common::MANAGE_TOKEN . $token,$manage,3600 * 6);
         return $this->success($manage->makeVisible('token')->toArray());
         return $this->success($manage->makeVisible('token')->toArray());
     }
     }
 
 

@@ -38,6 +38,7 @@ class OnlineCheckLogic extends BaseLogic
                 if($value['name'] == 'examine'){
                 if($value['name'] == 'examine'){
                     $info['qa_mid'] = $this->manager['id'];
                     $info['qa_mid'] = $this->manager['id'];
                     $optimizeInfo['optimist_mid'] = $this->manager['id'];
                     $optimizeInfo['optimist_mid'] = $this->manager['id'];
+                    $optimizeInfo['assist_mid'] = $this->manager['id'];
                 }
                 }
             }
             }
         }
         }