From 534c9a841aad04fce5d08210a1ccf159c6df169b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 13 Jul 2021 22:36:16 +0800
Subject: [PATCH] 1.通知公告接口修改 2.考试培训接口修改
---
src/main/java/org/springblade/modules/desk/controller/NoticeController.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/desk/controller/NoticeController.java b/src/main/java/org/springblade/modules/desk/controller/NoticeController.java
index e49dd9b..d513ec1 100644
--- a/src/main/java/org/springblade/modules/desk/controller/NoticeController.java
+++ b/src/main/java/org/springblade/modules/desk/controller/NoticeController.java
@@ -32,6 +32,8 @@
import org.springblade.modules.desk.service.INoticeService;
import org.springblade.modules.desk.vo.NoticeVO;
import org.springblade.modules.desk.wrapper.NoticeWrapper;
+import org.springblade.modules.system.entity.Dept;
+import org.springblade.modules.system.service.IDeptService;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
@@ -51,6 +53,8 @@
public class NoticeController extends BladeController {
private final INoticeService noticeService;
+
+ private final IDeptService iDeptService;
/**
* 详情
@@ -89,6 +93,13 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入notice")
public R<IPage<NoticeVO>> page(@ApiIgnore NoticeVO notice, Query query) {
+ //通过deptId获取组织机构信息
+ Dept dept = iDeptService.getById(notice.getDeptId());
+// if (dept.getDeptCategory() == 1) {
+// notice.setCategory(1);
+// } else {
+// notice.setCategory(2);
+// }
IPage<NoticeVO> pages = noticeService.selectNoticePage(Condition.getPage(query), notice);
return R.data(pages);
}
--
Gitblit v1.9.3