ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
@@ -81,7 +81,10 @@ public AjaxResult list() { Long userid = tokenService.getLoginUser().getUserid(); SysUser sysUser = sysUserService.getById(userid); LambdaQueryWrapper<SysRole> wrapper = new LambdaQueryWrapper<SysRole>().eq(SysRole::getDelFlag, 0).eq(SysRole::getStatus, 0); LambdaQueryWrapper<SysRole> wrapper = new LambdaQueryWrapper<SysRole>() .ne(SysRole::getRoleId, 2) .eq(SysRole::getDelFlag, 0) .eq(SysRole::getStatus, 0); if(sysUser.getRoleType() == 2){ wrapper.eq(SysRole::getShopId, sysUser.getObjectId()); } ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BannerController.java
@@ -83,12 +83,10 @@ //秒杀活动 if(null != jumpType1 && 4 == jumpType1){ SeckillActivityInfo activityInfo = seckillActivityInfoService.getById(banner.getContent()); if(null == activityInfo || activityInfo.getDelFlag() == 1){ if(null == activityInfo || activityInfo.getDelFlag() == 1 || !activityInfo.getVipIds().contains(vipId.toString())){ banner.setJumpType(1); } if(!activityInfo.getVipIds().contains(vipId.toString())){ banner.setJumpType(1); } } } return R.ok(list);
