From bdd967acce69d2420d9866789dfcee42c7e77023 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 19 九月 2025 14:10:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaNotificationController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaNotificationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaNotificationController.java
index 3f36a01..ed3d44e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaNotificationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaNotificationController.java
@@ -40,7 +40,7 @@
* @since 2025-09-15
*/
@RestController
-@Api("消息通知")
+@Api(tags = "消息通知")
@RequestMapping("/oa-notification")
public class OaNotificationController {
@Resource
@@ -120,7 +120,11 @@
String orDefault = deptMap.getOrDefault(Integer.parseInt(deptId), "");
deptName.append(orDefault).append(",");
}
- notificationDetailVO.setDeptName(deptName.substring(0,deptName.length()-1));
+ if (deptName.length() > 0){
+ notificationDetailVO.setDeptName(deptName.substring(0,deptName.length()-1));
+ }else {
+ notificationDetailVO.setDeptName("");
+ }
List<NotificationDeptUserDetailVO> notificationUserVOS = new ArrayList<>();
List<Long> userIds = notifationUsers.stream().map(e -> e.getUserId().longValue()).collect(Collectors.toList());
if (!userIds.isEmpty()){
--
Gitblit v1.7.1