~zhoushihao/YiWuProject.git

			@@ -21,7 +21,6 @@
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;

			import java.nio.charset.StandardCharsets;
			import java.util.List;
			import java.util.Map;
			import java.util.stream.Collectors;
			@@ -58,25 +57,18 @@
			@Override
			public List<SysMenu> getMenuTree(GeneralRequest request) {
			//todo:需要先获取用户的角色，角色下的菜单权限，拿到菜单id获取所有菜单

			SysUser user = UserInfoUtils.get();
			log.info("UserDatas：{}-----{}-------{}",request.getKey(),user,StringUtils.isNotBlank(request.getKey()));
			if(user!=null){
			MPJLambdaWrapper<SysUserRole> wrapper = new MPJLambdaWrapper<>();
			MPJLambdaWrapper<SysUserRole> wrapper = new MPJLambdaWrapper<>();

			wrapper.selectAll(SysMenu.class).distinct()
			.leftJoin(SysUser.class, SysUser::getId, SysUserRole::getUserId)
			.leftJoin(SysRoleMenu.class, SysRoleMenu::getRoleId, SysUserRole::getRoleId)
			.leftJoin(SysMenu.class, SysMenu::getId, SysRoleMenu::getMenuId)
			.eq(SysUser::getId, user.getId())
			.like(StringUtils.isNotBlank(request.getKey()), SysMenu::getMenuName, request.getKey());
			wrapper.selectAll(SysMenu.class).distinct()
			.innerJoin(SysUser.class, SysUser::getId, SysUserRole::getUserId)
			.innerJoin(SysRoleMenu.class, SysRoleMenu::getRoleId, SysUserRole::getRoleId)
			.innerJoin(SysMenu.class, SysMenu::getId, SysRoleMenu::getMenuId)
			.eq(SysUser::getId, user.getId())
			.like(StringUtils.isNotBlank(request.getKey()), SysMenu::getMenuName, request.getKey());

			List<SysMenu> menuList = sysUserRoleMapper.selectJoinList(SysMenu.class, wrapper);
			log.info("List<SysMenu> menuList：{}",menuList);
			return create(menuList);

			}
			return null;
			List<SysMenu> menuList = sysUserRoleMapper.selectJoinList(SysMenu.class, wrapper);
			return create(menuList);
			}

			@Override