From c560f1a14ae1fc468d90e50e6a32d805295875da Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 01 九月 2025 15:35:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-other/src/main/java/com/dsh/other/controller/SystemNoticeController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/SystemNoticeController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/SystemNoticeController.java
index 44797d0..5c91130 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/SystemNoticeController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/SystemNoticeController.java
@@ -26,17 +26,17 @@
@Autowired
private PhoneService phoneService;
- private final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ private final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
@PostMapping("/base/notice/queryNoticeDetails")
- public List<SysNotice> getSysNoticeDetails(){
+ public List<SysNotice> getSysNoticeDetails() {
List<SysNotice> notices = new ArrayList<>();
List<Notice> list = noticeSers.list(new QueryWrapper<Notice>()
.eq("state", 1)
.eq("upOrDown", 1)
.orderByDesc("insertTime"));
- if (list.size() > 0 ){
+ if (list.size() > 0) {
list.forEach(noList -> {
SysNotice notice = new SysNotice();
notice.setNoticeId(noList.getId());
@@ -51,10 +51,10 @@
@PostMapping("/base/notice/queryNotice")
- public SysNotice getSysNoticeBuId(@RequestParam("noticeId") Integer noticeId){
+ public SysNotice getSysNoticeBuId(@RequestParam("noticeId") Integer noticeId) {
SysNotice sysNotice = new SysNotice();
Notice notice = noticeSers.getById(noticeId);
- if (null != notice){
+ if (null != notice) {
sysNotice.setNoticeId(notice.getId());
sysNotice.setNoticeTitle(notice.getName());
sysNotice.setNoticeContents(notice.getContent());
@@ -65,10 +65,10 @@
@PostMapping("/base/notice/sysTell")
- public List<String> queryCustomerTel(){
+ public List<String> queryCustomerTel() {
List<String> tellS = new ArrayList<>();
List<Phone> list = phoneService.list();
- if (list.size() > 0 ){
+ if (list.size() > 0) {
String phone = list.get(0).getPhone();
String[] split = phone.split(",");
tellS = Arrays.asList(split);
--
Gitblit v1.7.1