From 5d36e1f987ef21e44ded2e8a1d06c28094ec1e76 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期六, 19 四月 2025 12:39:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 zhitan-system/src/main/java/com/zhitan/system/service/impl/SysRoleServiceImpl.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/zhitan-system/src/main/java/com/zhitan/system/service/impl/SysRoleServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/system/service/impl/SysRoleServiceImpl.java
index 8e6338e..cf18c4d 100644
--- a/zhitan-system/src/main/java/com/zhitan/system/service/impl/SysRoleServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/system/service/impl/SysRoleServiceImpl.java
@@ -433,6 +433,7 @@
                     DateUtils.parseDate(role.getParams().get("beginTime")),
                     DateUtils.parseDate(role.getParams().get("endTime")));
         }
+        queryWrapper.eq(SysRole::getDelFlag, 0);
         return roleMapper.selectPage(new Page<SysRole>(pageNum,pageSize),queryWrapper);
     }
 

--
Gitblit v1.9.3