From 0def57184505c841d374323a192157677c725273 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 14 Aug 2021 09:24:04 +0800
Subject: [PATCH] 1.许可审批
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index ccde67f..fa5bd22 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -233,7 +233,7 @@
@ApiOperationSupport(order = 12)
@ApiOperation(value = "导入用户", notes = "传入excel")
public R importUser(MultipartFile file, Integer isCovered) {
- UserImporter userImporter = new UserImporter(userService, isCovered == 1);
+ UserImporter userImporter = new UserImporter(userService, false);
ExcelUtil.save(file, userImporter, UserExcel.class);
return R.success("操作成功");
}
@@ -366,4 +366,15 @@
return R.data(tree);
}
+ /**
+ * 自定义用户列表(只有保安员)
+ */
+ @GetMapping("/selectInr")
+ public R selectInr(String deptid) {
+ List<Map<Object, Object>> list = userService.selectInr(deptid);
+ return R.data(list);
+ }
+
+
+
}
--
Gitblit v1.9.3