无关风月
昨天 995293880f5ca5c05ca94e53f5dac213b0155e3a
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaNotificationController.java
@@ -8,23 +8,17 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.entity.TDept;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.dto.SetDeptDTO;
import com.ruoyi.system.model.OaApproval;
import com.ruoyi.system.model.OaNotifationUser;
import com.ruoyi.system.model.OaNotification;
import com.ruoyi.system.query.ApprovalListQuery;
import com.ruoyi.system.query.NotificationListQuery;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.system.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.sql.Array;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -40,7 +34,7 @@
 * @since 2025-09-15
 */
@RestController
@Api("消息通知")
@Api(tags = "消息通知")
@RequestMapping("/oa-notification")
public class OaNotificationController {
    @Resource
@@ -120,7 +114,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()){