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()); } /**