From 36990e3fc35d1dcf341895b65cba19a0d805f258 Mon Sep 17 00:00:00 2001
From: ustcyc <yincun@163.com>
Date: 星期三, 16 四月 2025 20:13:00 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/zhitan-cloud/zhitan-ems

---
 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