From 217f9796d097b5005dcf5806966a4dee12082a6f Mon Sep 17 00:00:00 2001
From: chenshaohua <635616957@qq.com>
Date: Fri, 10 Jul 2026 19:02:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E5=B1=8F?=
 =?UTF-8?q?=E8=94=BD=E6=88=91=E7=9A=84=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/AppUserBlockCompanyController.java    |  2 +-
 .../cms/CmsUserBlockCompanyController.java    | 20 ++++---------------
 .../service/AppUserBlockCompanyService.java   |  5 -----
 .../impl/AppUserBlockCompanyServiceImpl.java  |  8 --------
 4 files changed, 5 insertions(+), 30 deletions(-)

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<AppUserBlockCompany> list=blockCompanyService.listByUserId(appUserBlockCompany.getUserId());
+        List<AppUserBlockCompany> 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<AppUserBlockCompany> list=blockCompanyService.listByUserId(appUserBlockCompany.getUserId());
-        return getDataTable(list);
-    }
-
-    /**
-     * 获取当前用户屏蔽企业列表
-     */
-    @ApiOperation("获取屏蔽企业列表")
-    @PreAuthorize("@ss.hasPermi('cms:blockCompany:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(AppUserBlockCompany appUserBlockCompany){
         startPage();
         List<AppUserBlockCompany> 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<AppUserBlockCompany
      */
     boolean isBlocked(Long userId, Long companyId);
 
-    /**
-     * 查询用户屏蔽列表
-     */
-    List<AppUserBlockCompany> listByUserId(Long userId);
-
     int batchCancelBlock(Long userId,List<Long> companyIdList);
 
     List<AppUserBlockCompany> 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<AppUserBlockComp
         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
     @Transactional(rollbackFor = Exception.class)
     public int batchCancelBlock(Long userId, List<Long> companyIdList) {