|
|
@@ -55,7 +55,7 @@ public class WxAlertLogController extends ApiBaseController {
|
|
|
Long userId = Long.valueOf(obj.getString("userId"));
|
|
|
SysUserExt sysUserExt = sysUserExtService.selectSysUserExtById(userId);
|
|
|
String salesLevel = sysUserExt.getSalesLevel();
|
|
|
- if(("customer_level").equals(salesLevel) || ("reseller_level").equals(salesLevel)){
|
|
|
+ if(("customer_level").equals(salesLevel) ){
|
|
|
userType = "1";
|
|
|
}else{
|
|
|
userType = "0";
|
|
|
@@ -73,7 +73,7 @@ public class WxAlertLogController extends ApiBaseController {
|
|
|
String[] split = alertConfiguration1.getUserType().split(",");
|
|
|
List<String> strings = Arrays.asList(split);
|
|
|
|
|
|
- if (strings.contains("1")&&sysUserExt.getSalesLevel().equals("customer_level")){
|
|
|
+ if ((strings.contains("1") || strings.contains("2")) &&sysUserExt.getSalesLevel().equals("customer_level")){
|
|
|
//满足类型对应a
|
|
|
AlertLog alertLog = alertLogService.selectAlertLogByUserIdAndAlertId(userId, alertConfiguration1.getAlertId());
|
|
|
if (alertLog!=null){
|
|
|
@@ -95,7 +95,7 @@ public class WxAlertLogController extends ApiBaseController {
|
|
|
return AjaxResult.success(alertConfiguration1);
|
|
|
}
|
|
|
}
|
|
|
- if(strings.contains("0")&&!sysUserExt.getSalesLevel().equals("customer_level")){
|
|
|
+ if((strings.contains("0") || strings.contains("2")) && !sysUserExt.getSalesLevel().equals("customer_level")){
|
|
|
System.out.println(userId);
|
|
|
AlertLog alertLog = alertLogService.selectAlertLogByUserIdAndAlertId(userId, alertConfiguration1.getAlertId());
|
|
|
if (alertLog!=null){
|
