From 6224d1c19b5d92a2e5dd31eaa36d70fdfb0f5243 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 19 Jul 2021 11:55:53 +0800
Subject: [PATCH] 1.新增保安员列表接口 2.行政区tree 接口修改
---
src/main/java/org/springblade/modules/desk/controller/NoticeController.java | 11 +++--------
1 files changed, 3 insertions(+), 8 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 d513ec1..4ca5c2c 100644
--- a/src/main/java/org/springblade/modules/desk/controller/NoticeController.java
+++ b/src/main/java/org/springblade/modules/desk/controller/NoticeController.java
@@ -33,7 +33,9 @@
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.entity.User;
import org.springblade.modules.system.service.IDeptService;
+import org.springblade.modules.system.service.IUserService;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
@@ -54,7 +56,7 @@
private final INoticeService noticeService;
- private final IDeptService iDeptService;
+ private final IUserService userService;
/**
* 详情
@@ -93,13 +95,6 @@
@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