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

@@ -63,9 +63,13 @@ class TemplateLog extends Command
      * @time   :2024/7/10 14:48
      * @time   :2024/7/10 14:48
      */
      */
     public function deleteTemplate(){
     public function deleteTemplate(){
-        $date = date('Y-m-d H:i:s', strtotime('-30 days'));
+
+        $date = date('Y-m-d H:i:s', strtotime('-60 days'));
         $templateLogModel = new BTemplateLog();
         $templateLogModel = new BTemplateLog();
-        return $templateLogModel->del(['created_at'=>['<=',$date]]);
+        $templateLogModel->del(['created_at'=>['<=',$date],'source'=>['!=',1]]);
+        //首页保存最新的20条记录
+        $latestIds = $templateLogModel->where(['source'=>1,'is_custom'=>0])->orderBy('created_at', 'desc')->take(20)->pluck('id'); // 仅提取ID字段
+        return $templateLogModel->del(['id'=>['not in',$latestIds]]);
     }
     }
 
 
     /**
     /**

@@ -63,7 +63,6 @@ class UpdateRoute extends Command
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);
             ProjectServer::useProject($v['id']);
             $this->getProduct();
             $this->getProduct();
-//            $this->updateProduct();
             DB::disconnect('custom_mysql');
             DB::disconnect('custom_mysql');
         }
         }
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
@@ -147,13 +146,6 @@ class UpdateRoute extends Command
             $route = RouteMap::setRoute($v['name'], RouteMap::SOURCE_MODULE, $v['id'], $project_id);
             $route = RouteMap::setRoute($v['name'], RouteMap::SOURCE_MODULE, $v['id'], $project_id);
             $customModel->edit(['route'=>$route],['id'=>$v['id']]);
             $customModel->edit(['route'=>$route],['id'=>$v['id']]);
         }
         }
-//        $cateModel = new CustomModuleCategory();
-//        $lists = $cateModel->list();
-//        foreach ($lists as $v1){
-//                $route = RouteMap::setRoute($v1['name'], RouteMap::SOURCE_MODULE_CATE, $v1['id'], $project_id);
-//                $cateModel->edit(['route'=>$route],['id'=>$v1['id']]);
-//
-//        }
     }
     }
 
 
     public function delProductKeyword(){
     public function delProductKeyword(){

@@ -302,17 +302,17 @@ class ProjectController extends BaseController
             //获取当前用户自己的项目
             //获取当前用户自己的项目
             $query->where(function ($subQuery) use ($info) {
             $query->where(function ($subQuery) use ($info) {
                 $subQuery->whereIn('gl_project.id',[1])//项目1+项目3默认显示
                 $subQuery->whereIn('gl_project.id',[1])//项目1+项目3默认显示
-                    ->orWhere('gl_project_deploy_build.leader_mid', $this->manage['id'])
-                    ->orWhere('gl_project_deploy_build.manager_mid', $this->manage['id'])
-                    ->orWhere('gl_project_deploy_build.designer_mid', $this->manage['id'])
-                    ->orWhere('gl_project_deploy_build.tech_mid', $this->manage['id'])
-                    ->orWhere('gl_project_deploy_optimize.manager_mid', $this->manage['id'])
-                    ->orWhere('gl_project_deploy_optimize.optimist_mid', $this->manage['id'])
-                    ->orWhere('gl_project_deploy_optimize.assist_mid', $this->manage['id'])
-                    ->orWhere('gl_project_deploy_optimize.tech_mid', $this->manage['id'])
-                    ->orWhere('gl_project_deploy_optimize.tech_leader', $this->manage['id'])
-                    ->orWhere('gl_project_deploy_optimize.quality_mid', $this->manage['id'])
-                    ->orWhere('gl_project_deploy_optimize.design_mid', $this->manage['id'])
+                    ->orWhere('gl_project_deploy_build.leader_mid', $info['id'])
+                    ->orWhere('gl_project_deploy_build.manager_mid', $info['id'])
+                    ->orWhere('gl_project_deploy_build.designer_mid', $info['id'])
+                    ->orWhere('gl_project_deploy_build.tech_mid', $info['id'])
+                    ->orWhere('gl_project_deploy_optimize.manager_mid', $info['id'])
+                    ->orWhere('gl_project_deploy_optimize.optimist_mid', $info['id'])
+                    ->orWhere('gl_project_deploy_optimize.assist_mid', $info['id'])
+                    ->orWhere('gl_project_deploy_optimize.tech_mid', $info['id'])
+                    ->orWhere('gl_project_deploy_optimize.tech_leader', $info['id'])
+                    ->orWhere('gl_project_deploy_optimize.quality_mid', $info['id'])
+                    ->orWhere('gl_project_deploy_optimize.design_mid', $info['id'])
                     ->orWhere('gl_project_deploy_build.dept_id', $info['belong_group'])
                     ->orWhere('gl_project_deploy_build.dept_id', $info['belong_group'])
                     ->orWhere('gl_project_deploy_optimize.dept_id', $info['belong_group']);
                     ->orWhere('gl_project_deploy_optimize.dept_id', $info['belong_group']);
             });
             });