diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserBlockCompanyController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserBlockCompanyController.java index e6d475d..d8a8bcc 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserBlockCompanyController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserBlockCompanyController.java @@ -58,7 +58,7 @@ public class AppUserBlockCompanyController extends BaseController { appUserBlockCompany.setUserId(SiteSecurityUtils.getUserId()); } startPage(); - List list=blockCompanyService.listByUserId(appUserBlockCompany.getUserId()); + List list=blockCompanyService.selectListByUserId(appUserBlockCompany); return getDataTable(list); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsUserBlockCompanyController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsUserBlockCompanyController.java index 07fdd91..0451858 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsUserBlockCompanyController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsUserBlockCompanyController.java @@ -60,28 +60,16 @@ public class CmsUserBlockCompanyController extends BaseController { /** * 获取当前用户屏蔽企业列表 */ - @ApiOperation("获取当前用户屏蔽企业列表") - @PreAuthorize("@ss.hasPermi('cms:blockCompany:listByUserId')") - @GetMapping("/listByUserId") - public TableDataInfo listByUserId(AppUserBlockCompany appUserBlockCompany){ + @ApiOperation("获取屏蔽企业列表") + @PreAuthorize("@ss.hasPermi('cms:blockCompany:list')") + @GetMapping("/list") + public TableDataInfo list(AppUserBlockCompany appUserBlockCompany){ if(!SecurityUtils.isLogin()){ return getDataTable(new ArrayList<>()); } if(appUserBlockCompany.getUserId()==null){ appUserBlockCompany.setUserId(RoleUtils.getSysAppuserId()); } - startPage(); - List list=blockCompanyService.listByUserId(appUserBlockCompany.getUserId()); - return getDataTable(list); - } - - /** - * 获取当前用户屏蔽企业列表 - */ - @ApiOperation("获取屏蔽企业列表") - @PreAuthorize("@ss.hasPermi('cms:blockCompany:list')") - @GetMapping("/list") - public TableDataInfo list(AppUserBlockCompany appUserBlockCompany){ startPage(); List list=blockCompanyService.selectListByUserId(appUserBlockCompany); return getDataTable(list); diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/AppUserBlockCompanyService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/AppUserBlockCompanyService.java index be81c47..e74b412 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/AppUserBlockCompanyService.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/AppUserBlockCompanyService.java @@ -27,11 +27,6 @@ public interface AppUserBlockCompanyService extends IService listByUserId(Long userId); - int batchCancelBlock(Long userId,List companyIdList); List selectListByUserId(AppUserBlockCompany appUserBlockCompany); diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserBlockCompanyServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserBlockCompanyServiceImpl.java index aad076b..e77102a 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserBlockCompanyServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserBlockCompanyServiceImpl.java @@ -44,14 +44,6 @@ public class AppUserBlockCompanyServiceImpl extends ServiceImpl 0; } - @Override - public List listByUserId(Long userId) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(AppUserBlockCompany::getUserId, userId) - .orderByDesc(AppUserBlockCompany::getCreateTime); - return baseMapper.selectList(wrapper); - } - @Override @Transactional(rollbackFor = Exception.class) public int batchCancelBlock(Long userId, List companyIdList) {