From 19f40c8e0649ae81b3f0183a6f4c8aa6c3db39bc Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 18 Nov 2021 17:54:37 +0800
Subject: [PATCH] 证书打印信息导出修改,已过考试的，系统每天凌晨1点定时清理，标记为缺考，并生成缺考记录，保安员导入新增年龄判断，超过60岁的不能导入
---
src/main/java/org/springblade/modules/desk/service/impl/NoticeServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/desk/service/impl/NoticeServiceImpl.java b/src/main/java/org/springblade/modules/desk/service/impl/NoticeServiceImpl.java
index bb6413b..a162b1f 100644
--- a/src/main/java/org/springblade/modules/desk/service/impl/NoticeServiceImpl.java
+++ b/src/main/java/org/springblade/modules/desk/service/impl/NoticeServiceImpl.java
@@ -17,13 +17,17 @@
package org.springblade.modules.desk.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.desk.entity.Notice;
import org.springblade.modules.desk.mapper.NoticeMapper;
import org.springblade.modules.desk.service.INoticeService;
import org.springblade.modules.desk.vo.NoticeVO;
+import org.springblade.modules.system.service.IDeptService;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* 服务实现类
@@ -31,13 +35,20 @@
* @author Chill
*/
@Service
+@AllArgsConstructor
public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, Notice> implements INoticeService {
+
+ private IDeptService deptService;
@Override
public IPage<NoticeVO> selectNoticePage(IPage<NoticeVO> page, NoticeVO notice) {
// 若不使用mybatis-plus自带的分页方法，则不会自动带入tenantId，所以我们需要自行注入
notice.setTenantId(AuthUtil.getTenantId());
- return page.setRecords(baseMapper.selectNoticePage(page, notice));
+ List<NoticeVO> noticeVOS = baseMapper.selectNoticePage(page, notice);
+// noticeVOS.forEach(noticeVO -> {
+// noticeVO.setDeptName(deptService.getById(noticeVO.getDeptId()).getDeptName());
+// });
+ return page.setRecords(noticeVOS);
}
}
--
Gitblit v1.9.3