From 00918b0d5a5b48116887f92c62d715219dae8f8b Mon Sep 17 00:00:00 2001 From: xjm Date: Thu, 30 May 2024 11:15:49 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=BF=94=E5=9B=9E=E8=A1=8C?= =?UTF-8?q?=E6=94=BF=E5=8C=BA=E5=88=92=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/whdc/controller/AddressBookController.java | 2 +- src/main/java/com/whdc/controller/WarningController.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/whdc/controller/AddressBookController.java b/src/main/java/com/whdc/controller/AddressBookController.java index b5eeffa..ab4d8f4 100644 --- a/src/main/java/com/whdc/controller/AddressBookController.java +++ b/src/main/java/com/whdc/controller/AddressBookController.java @@ -249,7 +249,7 @@ public class AddressBookController { if (StringUtils.isBlank(adcd)){ adcd = byId.getAdcd(); } - model.setRole(byId.getRole()); + model.setRole(user.getRole()); versionsService.saveInfo(model, VersionsType.UPDATE,adcd); boolean data = service.updateById(model); if (data) { diff --git a/src/main/java/com/whdc/controller/WarningController.java b/src/main/java/com/whdc/controller/WarningController.java index a7aa176..26d3519 100644 --- a/src/main/java/com/whdc/controller/WarningController.java +++ b/src/main/java/com/whdc/controller/WarningController.java @@ -238,7 +238,9 @@ public class WarningController { } } - return respList; + + return respList.stream().sorted(Comparator.comparing(WarningListVo::getPublishTime).reversed()) + .collect(Collectors.toList()); } /**