From 75f9894ebac12b13c7ead27c3e16db833ee9251a Mon Sep 17 00:00:00 2001
From: z1415143022 <z1415143022@163.com>
Date: 星期二, 25 三月 2025 20:02:45 +0800
Subject: [PATCH] Merge branch 'develop1.0' into zhangjw_from_develop1.0
---
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