Merge branch 'alert' into uat

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

@@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectAlertConfigurationByAlertStatus" parameterType="Long" resultMap="AlertConfigurationResult">
         <include refid="selectAlertConfigurationVo"/>
         WHERE alert_status = 1
-        <if test="userType !=null and userType !='' and orgCode !='null' ">
+        <if test="userType !=null and userType !=''  ">
             and user_type = #{userType}
         </if>
     </select>