# Conflicts:

#	suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/WxAlertLogController.java

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

@@ -92,7 +92,7 @@ public class AlertConfigurationServiceImpl implements IAlertConfigurationService
                 //diy
                 if( alert.getOrgCode() ==null || ("null").equals(alert.getOrgCode())){
                     for (String userType:userTypeList){
-                        String [] userTypes = userType.split(",");
+                        String [] userTypes = alert.getUserType().split(",");
                         boolean exists = Arrays.stream(userTypes)
                                 .anyMatch(str -> str.equals(userType));
                         if (exists){

suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/WxAlertLogController.java

@@ -88,7 +88,7 @@ public class WxAlertLogController  extends ApiBaseController {
             alertConfiguration1 = alertConfigurationService. selectAlertConfiguration(userTypeList);
         }
         //是否有启动弹窗
-        log.info("本次匹配的弹窗:{}",alertConfiguration1);
+        log.info("本次匹配的弹窗:{}",JSON.toJSON(alertConfiguration1));
         if (alertConfiguration1 != null){
             //有启动
             alertConfiguration1.setIsClearCache(false);