From bcd8b3b7e8ef8ca9079b53f316d1973308e3e457 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 14 Aug 2021 15:48:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w
---
src/main/java/org/springblade/modules/permit/controller/PermitController.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/permit/controller/PermitController.java b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
index 21aa0c5..5db51e5 100644
--- a/src/main/java/org/springblade/modules/permit/controller/PermitController.java
+++ b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
@@ -89,6 +89,7 @@
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入permit")
public R<IPage<Permit>> list(Permit permit, Query query) {
+ permit.setStorage("1");
IPage<Permit> pages = permitService.page(Condition.getPage(query), Condition.getQueryWrapper(permit));
return R.data(pages);
}
@@ -111,11 +112,9 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入permit")
public R save(@Valid @RequestBody Permit permit) {
- BladeUser user = AuthUtil.getUser();
permit.setType("2");
permit.setStorage("1");
permit.setPermitime(new Date());
- permit.setDeptid(user.getDeptId());
return R.status(permitService.save(permit));
}
--
Gitblit v1.9.3