From 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 19 Aug 2021 15:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/desk/controller/NoticeController.java | 6 +-----
1 files changed, 1 insertions(+), 5 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 8b42da3..3a69ddf 100644
--- a/src/main/java/org/springblade/modules/desk/controller/NoticeController.java
+++ b/src/main/java/org/springblade/modules/desk/controller/NoticeController.java
@@ -95,7 +95,7 @@
@ApiOperation(value = "分页", notes = "传入notice")
public R<IPage<NoticeVO>> page(@ApiIgnore NoticeVO notice, Query query) {
//通过deptId获取组织机构信息
- Dept dept = iDeptService.getById(notice.getDeptId());
+// Dept dept = iDeptService.getById(notice.getDeptId());
// if (dept.getDeptCategory() == 1) {
// notice.setCategory(1);
// } else {
@@ -132,8 +132,6 @@
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入notice")
public R submit(@RequestBody Notice notice) throws Exception {
- //调用内网
- arg.test01(arg.url+"/blade-desk/notice/submit",notice);
return R.status(noticeService.saveOrUpdate(notice));
}
@@ -144,8 +142,6 @@
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入notice")
public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) throws Exception {
- //调用内网
-// arg.test01(arg.url+"/blade-desk/notice/remove",ids);
boolean temp = noticeService.deleteLogic(Func.toLongList(ids));
return R.status(temp);
}
--
Gitblit v1.9.3