From d80c1fe5bc2b604a27c2e985ea7593ba6618cc37 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 02 二月 2026 11:18:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java
index bef5926..8bf7123 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java
@@ -30,8 +30,8 @@
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.project.system.service.ISysNoticeService;
-import com.ruoyi.staff.mapper.StaffJoinLeaveRecordMapper;
-import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
+import com.ruoyi.staff.mapper.StaffOnJobMapper;
+import com.ruoyi.staff.pojo.StaffOnJob;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -48,11 +48,12 @@
private final MeetDraftMapper meetDraftMapper;
private final MeetApplicationMapper meetApplicationMapper;
- private final StaffJoinLeaveRecordMapper staffJoinLeaveRecordMapper;
+ private final StaffOnJobMapper staffOnJobMapper;
private final MeetingMinutesMapper meetingMinutesMapper;
private final SysUserMapper userMapper;
private final ISysNoticeService sysNoticeService;
+
@Override
public IPage<MeetingRoom> getMeetingRoomList(SearchMeetingRoomVo vo) {
@@ -165,7 +166,7 @@
.filter(s -> !s.isEmpty())
.map(Long::valueOf)
.map(staffId -> {
- StaffJoinLeaveRecord record = staffJoinLeaveRecordMapper.selectById(staffId);
+ StaffOnJob record = staffOnJobMapper.selectById(staffId);
if (record == null) {
return null;
}
@@ -181,11 +182,10 @@
if (!userIds.isEmpty()) {
sysNoticeService.simpleNoticeByUser(
"浼氳閫氱煡",
- "浼氳涓婚锛�" + application.getTitle() + "\n" +
- "浼氳鏃堕棿锛�" + application.getStartTime() + "-" + application.getEndTime() + "\n" +
+ "浼氳涓婚锛�" + application.getTitle() + "\t" +
+ "浼氳鏃堕棿锛�" + application.getStartTime() + "-" + application.getEndTime() + "\t" +
"鍙戣捣浜猴細" + application.getApplicant(),
userIds,
- application.getTenantId(),
""
);
}
--
Gitblit v1.9.3