默认值 "null"

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

@@ -80,7 +80,7 @@ public class AlertConfigurationServiceImpl implements IAlertConfigurationService
         if(alertConfigurationList !=null && alertConfigurationList.size()>0){
             Iterator<AlertConfiguration> it = alertConfigurationList.iterator();
             List<String> orgCodes =new ArrayList<>();
-            if(alertConfiguration.getOrgCode() !=null) {
+            if(alertConfiguration.getOrgCode() !=null &&  !("null").equals(alertConfiguration.getOrgCode() )  ) {
                  orgCodes = alertConfigurationMapper.selectOrgCode(alertConfiguration.getSalesLevel(), alertConfiguration.getOrgCode());
             }else{
                 //diy

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

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