|
|
@@ -58,11 +58,19 @@ public class WxAlertLogController extends ApiBaseController {
|
|
|
SysUserExt sysUserExt = sysUserExtService.selectSysUserExtById(userId);
|
|
|
String salesLevel = sysUserExt.getSalesLevel();
|
|
|
List<String> userTypeList = new ArrayList<>();
|
|
|
+ SysUserShopExt sysUserShopExt = sysUserShopExtService.selectSysUserShopExtById(obj.getString("userId"));
|
|
|
if(("customer_level").equals(salesLevel)||("reseller_level").equals(salesLevel) ){
|
|
|
userTypeList.add("1");
|
|
|
}else{
|
|
|
userTypeList.add("0");
|
|
|
}
|
|
|
+ if (sysUserShopExt != null){
|
|
|
+ if ("0".equals(sysUserShopExt.getIsShopType())){
|
|
|
+ userTypeList.add("3");
|
|
|
+ }else {
|
|
|
+ userTypeList.add("4");
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
//是否有启动
|
|
|
AlertConfiguration alertConfiguration1 = alertConfigurationService.selectAlertConfigurationByAlertStatus(userTypeList,sysUserExt.getSalesLevel(),sysUserExt.getOrgCode());
|
|
|
@@ -109,7 +117,7 @@ public class WxAlertLogController extends ApiBaseController {
|
|
|
return AjaxResult.success(alertConfiguration1);
|
|
|
}
|
|
|
}
|
|
|
- SysUserShopExt sysUserShopExt = sysUserShopExtService.selectSysUserShopExtById(obj.getString("userId"));
|
|
|
+
|
|
|
//判断该用户是否为金牌店或仿石漆
|
|
|
if (sysUserShopExt != null){
|
|
|
if((strings.contains("3") || strings.contains("2")) && "0".equals(sysUserShopExt.getIsShopType())){
|
