Merge branch '20250428首页' of http://git.dgtis.com/qxp/suishenbang-oneportal into 20250428首页

suishenbang-system/src/main/java/com/dgtly/system/service/impl/AlertConfigurationServiceImpl.java

@@ -106,8 +106,6 @@ public class AlertConfigurationServiceImpl implements IAlertConfigurationService
                                     (start2.after(start1) && start2.before(end1)) ||
                                     (end2.after(start1) && end2.before(end1))) {
                                return 1;
-                            } else {
-                               return 0;
                             }
                         }
                 }else{
@@ -118,14 +116,14 @@ public class AlertConfigurationServiceImpl implements IAlertConfigurationService
                                 (start2.after(start1) && start2.before(end1)) ||
                                 (end2.after(start1) && end2.before(end1))) {
                             return 1;
-                        } else {
-                            return 0;
                         }
                     }
+
             }
         }else{
                     return 0;
         }
+
         return 0;
     }