zkr/shz-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改查询屏蔽我的列表接口

Browse Source
This commit is contained in:
chenshaohua
2026-07-10 19:02:09 +08:00
parent 5286398f51
commit 217f9796d0
4 changed files with 5 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserBlockCompanyController.java
View File

@@ -58,7 +58,7 @@ public class AppUserBlockCompanyController extends BaseController {
appUserBlockCompany.setUserId(SiteSecurityUtils.getUserId()); appUserBlockCompany.setUserId(SiteSecurityUtils.getUserId());
} }
startPage(); startPage();
List<AppUserBlockCompany> list=blockCompanyService.listByUserId(appUserBlockCompany.getUserId()); List<AppUserBlockCompany> list=blockCompanyService.selectListByUserId(appUserBlockCompany);
return getDataTable(list); return getDataTable(list);
} }

20
ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsUserBlockCompanyController.java
View File

@@ -60,28 +60,16 @@ public class CmsUserBlockCompanyController extends BaseController {
/** /**
* 获取当前用户屏蔽企业列表 * 获取当前用户屏蔽企业列表
*/ */
@ApiOperation("获取当前用户屏蔽企业列表") @ApiOperation("获取屏蔽企业列表")
@PreAuthorize("@ss.hasPermi('cms:blockCompany:listByUserId')") @PreAuthorize("@ss.hasPermi('cms:blockCompany:list')")
@GetMapping("/listByUserId") @GetMapping("/list")
public TableDataInfo listByUserId(AppUserBlockCompany appUserBlockCompany){ public TableDataInfo list(AppUserBlockCompany appUserBlockCompany){
if(!SecurityUtils.isLogin()){ if(!SecurityUtils.isLogin()){
return getDataTable(new ArrayList<>()); return getDataTable(new ArrayList<>());
} }
if(appUserBlockCompany.getUserId()==null){ if(appUserBlockCompany.getUserId()==null){
appUserBlockCompany.setUserId(RoleUtils.getSysAppuserId()); appUserBlockCompany.setUserId(RoleUtils.getSysAppuserId());
} }
startPage();
List<AppUserBlockCompany> list=blockCompanyService.listByUserId(appUserBlockCompany.getUserId());
return getDataTable(list);
}
/**
* 获取当前用户屏蔽企业列表
*/
@ApiOperation("获取屏蔽企业列表")
@PreAuthorize("@ss.hasPermi('cms:blockCompany:list')")
@GetMapping("/list")
public TableDataInfo list(AppUserBlockCompany appUserBlockCompany){
startPage(); startPage();
List<AppUserBlockCompany> list=blockCompanyService.selectListByUserId(appUserBlockCompany); List<AppUserBlockCompany> list=blockCompanyService.selectListByUserId(appUserBlockCompany);
return getDataTable(list); return getDataTable(list);

5
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/AppUserBlockCompanyService.java
View File

@@ -27,11 +27,6 @@ public interface AppUserBlockCompanyService extends IService<AppUserBlockCompany
*/ */
boolean isBlocked(Long userId, Long companyId); boolean isBlocked(Long userId, Long companyId);
/**
* 查询用户屏蔽列表
*/
List<AppUserBlockCompany> listByUserId(Long userId);
int batchCancelBlock(Long userId,List<Long> companyIdList); int batchCancelBlock(Long userId,List<Long> companyIdList);
List<AppUserBlockCompany> selectListByUserId(AppUserBlockCompany appUserBlockCompany); List<AppUserBlockCompany> selectListByUserId(AppUserBlockCompany appUserBlockCompany);

8
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserBlockCompanyServiceImpl.java
View File

@@ -44,14 +44,6 @@ public class AppUserBlockCompanyServiceImpl extends ServiceImpl<AppUserBlockComp
return baseMapper.checkUserBlockCompany(userId, companyId) > 0; return baseMapper.checkUserBlockCompany(userId, companyId) > 0;
} }
@Override
public List<AppUserBlockCompany> listByUserId(Long userId) {
LambdaQueryWrapper<AppUserBlockCompany> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(AppUserBlockCompany::getUserId, userId)
.orderByDesc(AppUserBlockCompany::getCreateTime);
return baseMapper.selectList(wrapper);
}
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public int batchCancelBlock(Long userId, List<Long> companyIdList) { public int batchCancelBlock(Long userId, List<Long> companyIdList) {