From d34b3987a7c89c29a74eb7d3525b2a486eeaca10 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 08 一月 2025 17:17:55 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou

---
 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RoleController.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RoleController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RoleController.java
index d3b99a9..d1afa4a 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RoleController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RoleController.java
@@ -65,6 +65,7 @@
     public R<IPage<Role>> queryPageList(@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                                         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
         return R.ok(roleService.lambdaQuery().eq(Role::getDelFlag, 0)
+                        .ne(Role::getRoleName,"加盟商")
                 .orderByDesc(Role::getCreateTime).page(Page.of(pageNum, pageSize)));
     }
 

--
Gitblit v1.7.1