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

@@ -52,7 +52,7 @@ class AsideTicketController extends BaseController
                 $status = $request->input('status');
                 $status = $request->input('status');
                 if($status == 10){
                 if($status == 10){
                     $newTime = date("Y-m-d H:i:s", strtotime("-120 hours"));
                     $newTime = date("Y-m-d H:i:s", strtotime("-120 hours"));
-                    return $query->where('status', 0)->where('plan_end_at','<',$newTime);//超过120个小时未处理的工单
+                    return $query->where('status', '!=' ,Tickets::STATUS_COMPLETED)->where('plan_end_at','<',$newTime);//超过120个小时未处理的工单
                 }else{
                 }else{
                     return $query->where('status', $status);
                     return $query->where('status', $status);
                 }
                 }

@@ -84,20 +84,19 @@ class AsideTicketLogController extends BaseController
             if ($pending)
             if ($pending)
             {
             {
                 $ticket->status = Tickets::STATUS_PROCESSING;
                 $ticket->status = Tickets::STATUS_PROCESSING;
-            }else
-            {
+            }else {
                 // 如果所有子任务都完成了，则将工单状态改为已完成
                 // 如果所有子任务都完成了，则将工单状态改为已完成
-                // todo 注意：建站期间的工单，所有人都完成后，不自动完成工单，需要项目经理验收修改工单状态
-                if (($ticket->title == 'GEO项目') || !($ticket->project->status == 1 && in_array($ticket->project->project_cate, [1, 2])))
-                {
-                    $ticket->status = Tickets::STATUS_COMPLETED;
-                    $ticket->end_at = now();
-                    $ticket->end_time = diffInHours($ticket->created_at,$ticket->end_at);
-                    $project = $ticket->project;
-                    if ($project->wechat_switch && !$ticket->close_wechat)
-                        $project->pushWechatGroupMsg("工单（ID：{$ticket->id}）已全部完成，请访问查看详情！");
-                    $ticket->pushDing('finish');
-                }else{
+                    // todo 注意：建站期间的工单，所有人都完成后，不自动完成工单，需要项目经理验收修改工单状态
+                    if (($ticket->title == 'GEO项目') || !($ticket->project->status == 1 && in_array($ticket->project->project_cate, [1, 2])))
+                    {
+                        $ticket->status = Tickets::STATUS_COMPLETED;
+                        $ticket->end_at = now();
+                        $ticket->end_time = diffInHours($ticket->created_at,$ticket->end_at);
+                        $project = $ticket->project;
+                        if ($project->wechat_switch && !$ticket->close_wechat)
+                            $project->pushWechatGroupMsg("工单（ID：{$ticket->id}）已全部完成，请访问查看详情！");
+                        $ticket->pushDing('finish');
+                    }else{
                     $ticket->status = Tickets::STATUS_YANSHOU;
                     $ticket->status = Tickets::STATUS_YANSHOU;
                 }
                 }
             }
             }

@@ -263,6 +263,9 @@ class CustomModuleContentLogic extends BaseLogic
      * @time   :2023/10/20 9:02
      * @time   :2023/10/20 9:02
      */
      */
     public function getCategory($category){
     public function getCategory($category){
+        if(empty($category)){
+            return '';
+        }
         $str = '';
         $str = '';
         foreach ($category as $v){
         foreach ($category as $v){
             $str .= $v.',';
             $str .= $v.',';