弹框修改

suishenbang-system/src/main/resources/mapper/system/AlertConfigurationMapper.xml

@@ -47,8 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="userType !=null and userType !='' and userType !='2'.toString() ">
           and ( user_type =#{userType}  or user_type ='2')
         </if>
-        AND now() >=alert_start_time
-        AND alert_end_time > now()
+
 
     </select>
     
@@ -63,6 +62,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="userType !=null and userType !=''  ">
             and ( user_type =#{userType}  or user_type ='2')
         </if>
+        AND now() >=alert_start_time
+        AND alert_end_time > now()
     </select>
 
     <insert id="insertAlertConfiguration" parameterType="AlertConfiguration" useGeneratedKeys="true" keyProperty="alertId">