ceshi wode jiaolian

@@ -17,6 +17,7 @@ use think\Db;
 
 
 class ToolController extends HomeBaseController
 class ToolController extends HomeBaseController
 {
 {
+
     public function isMixTime($begintime1,$endtime1,$begintime2,$endtime2)
     public function isMixTime($begintime1,$endtime1,$begintime2,$endtime2)
     {
     {
         $status = $begintime2 - $begintime1;
         $status = $begintime2 - $begintime1;
@@ -32,6 +33,7 @@ class ToolController extends HomeBaseController
             if($status2>=0){
             if($status2>=0){
                 return false;
                 return false;
             }else{
             }else{
+
                 return true;
                 return true;
             }
             }
         }
         }

@@ -70,7 +70,7 @@ class YuyueController extends UserBaseController
             $f2 = array_search($eend, $day_find);
             $f2 = array_search($eend, $day_find);
             $ac = count($day_find) - 1;
             $ac = count($day_find) - 1;
 
 
-            if (($f2 && $f2 > '0') || ($f1 && $f1 < $ac) || ($f1 && $f2)) {
+            if (($f2 && ($f2 > '0')) || ($f1 && ($f1 < $ac)) || ($f1 && $f2)) {
                 $ex .= $v['teach_id'] . ',';
                 $ex .= $v['teach_id'] . ',';
             }
             }
         }
         }