作者 lyh

gx

@@ -40,6 +40,7 @@ class Count extends Command @@ -40,6 +40,7 @@ class Count extends Command
40 ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id') 40 ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
41 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') 41 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
42 ->select($this->selectParam())->get()->toArray(); 42 ->select($this->selectParam())->get()->toArray();
  43 + if(!empty($list)){
43 $data = []; 44 $data = [];
44 $yesterday = Carbon::yesterday()->toDateString(); 45 $yesterday = Carbon::yesterday()->toDateString();
45 foreach ($list as $v){ 46 foreach ($list as $v){
@@ -68,6 +69,7 @@ class Count extends Command @@ -68,6 +69,7 @@ class Count extends Command
68 } 69 }
69 //判断数据是否存在 70 //判断数据是否存在
70 DB::table('gl_count')->insert($data); 71 DB::table('gl_count')->insert($data);
  72 + }
71 echo $this->error; 73 echo $this->error;
72 } 74 }
73 75
@@ -171,7 +171,7 @@ class UserLoginLogic @@ -171,7 +171,7 @@ class UserLoginLogic
171 * @time :2023/8/29 15:26 171 * @time :2023/8/29 15:26
172 */ 172 */
173 public function assembleParam($mobile,$project_id){ 173 public function assembleParam($mobile,$project_id){
174 - $info = $this->model->read(['mobile'=>$mobile,'project_id'=>$project_id],['id','mobile','status','role_id','token','name','project_id']); 174 + $info = $this->model->read(['mobile'=>$mobile,'project_id'=>$project_id],['id','mobile','status','role_id','token','name','wechat','project_id']);
175 //获取项目详情 175 //获取项目详情
176 $project = $this->getProjectInfo($project_id); 176 $project = $this->getProjectInfo($project_id);
177 $info['title'] = $project['title'] ?? ''; 177 $info['title'] = $project['title'] ?? '';