From c9f07c1f79e7ea9eb00925975d3ae2c9e8dcbd25 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期三, 20 三月 2024 11:37:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/service/system/impl/SystemPermissionServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/system/impl/SystemPermissionServiceImpl.java b/server/service/src/main/java/com/doumee/service/system/impl/SystemPermissionServiceImpl.java
index 3972947..ccce6ae 100644
--- a/server/service/src/main/java/com/doumee/service/system/impl/SystemPermissionServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/system/impl/SystemPermissionServiceImpl.java
@@ -89,7 +89,12 @@
@Override
public List<SystemPermission> findList(SystemPermission systemPermission) {
- Wrapper<SystemPermission> wrapper = new QueryWrapper<>(systemPermission);
+ QueryWrapper<SystemPermission> wrapper = new QueryWrapper<>(systemPermission);
+ if(systemPermission.getTypeList()!=null){
+ wrapper.lambda().and(w->{w.isNull(SystemPermission::getType).or()
+ .in(SystemPermission::getType,systemPermission.getTypeList());
+ });
+ }
return systemPermissionMapper.selectList(wrapper);
}
--
Gitblit v1.9.3