From 2c8a80699b002e7a91eb885b884088e17c719245 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 08 Nov 2022 10:12:55 +0800
Subject: [PATCH] 修改高新区质量空气质量报告的地区名字
---
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
index ae847c4..a47ccf5 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
@@ -119,7 +119,7 @@
//������������������
Map<String, Object> userInfo = new LinkedHashMap<>();
- //������in���
+ //������������
userInfo.put("userId", userBo.getId());
userInfo.put("account", userBo.getAccount());
userInfo.put("userName", userBo.getUserName());
@@ -219,6 +219,7 @@
//������������������������������
List<Menu> nextLevelMenus = menus.stream()
.filter(o -> o.getParentId().equals(menu.getId()))
+ .sorted(Comparator.comparing(Menu::getOrder))
.collect(Collectors.toList());
List<Map<String, Object>> list = new ArrayList<>();
if (nextLevelMenus.size() > 0) {
--
Gitblit v1.8.0