Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -31,7 +31,7 @@ class countProject extends Command
     protected $description = '项目数据统计生成文件';
     protected $description = '项目数据统计生成文件';
 
 
     public function handle(){
     public function handle(){
-        $start = '2024-01';
+        $start = '2023-10';
         $end = '2024-09';
         $end = '2024-09';
         $data = $this->exportDataProject($start,$end);
         $data = $this->exportDataProject($start,$end);
         $result = $this->exportData($data);
         $result = $this->exportData($data);
@@ -185,7 +185,7 @@ class countProject extends Command
      */
      */
     public function countAll(){
     public function countAll(){
         $projectModel = new Project();
         $projectModel = new Project();
-        $data['count'] = $projectModel->count(['deleted_at'=>0]);//所有项目总数
+        $data['count'] = $projectModel->counts(['deleted_at'=>0]);//所有项目总数
         $data['go_online_count'] = $projectModel->counts(['uptime'=>['!=',null],'deleted_at'=>0]);//上线项目总数
         $data['go_online_count'] = $projectModel->counts(['uptime'=>['!=',null],'deleted_at'=>0]);//上线项目总数
         $data['promotion_web_count'] = $projectModel->counts(['type'=>3,'deleted_at'=>0]);//推广项目总数
         $data['promotion_web_count'] = $projectModel->counts(['type'=>3,'deleted_at'=>0]);//推广项目总数
         $data['create_web_count'] = $projectModel->counts(['type'=>2,'deleted_at'=>0]);//建站项目总数
         $data['create_web_count'] = $projectModel->counts(['type'=>2,'deleted_at'=>0]);//建站项目总数

@@ -608,9 +608,6 @@ class ProjectController extends BaseController
      */
      */
     public function getManagerList(){
     public function getManagerList(){
         $hrManagerModel = new ManageHr();
         $hrManagerModel = new ManageHr();
-        if(!isset($this->param['name']) || empty($this->param['name'])){
-            $this->map['status'] = $hrManagerModel::STATUS_ONE;
-        }
         if(isset($this->map['entry_position']) && !empty($this->map['entry_position'])){
         if(isset($this->map['entry_position']) && !empty($this->map['entry_position'])){
             $this->map['entry_position'] = ['in',$this->map['entry_position']];
             $this->map['entry_position'] = ['in',$this->map['entry_position']];
         }
         }

@@ -173,16 +173,15 @@ class FileManageController extends BaseController
 
 
     public function delete(Request $request){
     public function delete(Request $request){
         $request->validate([
         $request->validate([
-            'id'=>'required',
+            'id'=>'required | array',
         ],[
         ],[
             'id.required' => 'ID不能为空',
             'id.required' => 'ID不能为空',
         ]);
         ]);
-        $fileManage = FileManage::find($this->param['id']);
-        if(!$fileManage){
-            $this->response('数据不存在或者已经删除');
+        if(!is_array($this->param['id'])){
+            $this->param['id'] = [$this->param['id']];
         }
         }
-        $fileManage->delete();
-
+        $fileManage = new FileManage();
+        $fileManage->del(['id'=>['in',$this->param['id']]]);
         $this->response('success');
         $this->response('success');
     }
     }
 }
 }