From 62084735c1f5d6b6d4771aadf4d9241479a4d4ee Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 24 Oct 2022 15:06:16 +0800
Subject: [PATCH] 用户查询增加模糊查询；修复当编辑用户时账号解封的问题；全景管理查询未删除的数据；当性别，生日未填时数据库同时也录入数据

---
 src/main/java/org/springblade/modules/system/controller/MenuController.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/controller/MenuController.java b/src/main/java/org/springblade/modules/system/controller/MenuController.java
index b7d5288..6497f4d 100644
--- a/src/main/java/org/springblade/modules/system/controller/MenuController.java
+++ b/src/main/java/org/springblade/modules/system/controller/MenuController.java
@@ -35,6 +35,7 @@
 import org.springblade.modules.system.entity.Menu;
 import org.springblade.modules.system.entity.TopMenu;
 import org.springblade.modules.system.service.IMenuService;
+import org.springblade.modules.system.service.IRoleService;
 import org.springblade.modules.system.service.ITopMenuService;
 import org.springblade.modules.system.vo.CheckedTreeVO;
 import org.springblade.modules.system.vo.GrantTreeVO;
@@ -63,6 +64,7 @@
 
 	private final IMenuService menuService;
 	private final ITopMenuService topMenuService;
+	private final IRoleService roleService;
 
 	/**
 	 * 详情
@@ -241,6 +243,7 @@
 		vo.setMenu(menuService.roleTreeKeys(roleIds));
 		vo.setDataScope(menuService.dataScopeTreeKeys(roleIds));
 		vo.setApiScope(menuService.apiScopeTreeKeys(roleIds));
+		vo.setSystemIds(roleService.getById(roleIds).getSystemId());
 		return R.data(vo);
 	}
 

--
Gitblit v1.9.3