From e1454a154718e20abbab36d0def4de9124a07254 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 11 六月 2021 12:03:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/nanometer/smartlab/service/SysUserService.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysUserService.java b/src/main/java/com/nanometer/smartlab/service/SysUserService.java
index bed31fc..8915b4d 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysUserService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysUserService.java
@@ -37,7 +37,7 @@
public int insertSysUserList(List<SysUser> userList);
- Map getUser(String id);
+ SysUser getUser(String id);
void updateUserFavor(SysReagent reagent, SysUser user) throws Exception;
@@ -48,4 +48,8 @@
List<LaboratoryVo.LaboratoryUser> getUserByProject(String project);
List<SysUser> getUserByArp(String arp);
+
+ List<Map> getExportUserList(String arp, String name, String departmentName, String project, String company);
+
+ void exportUser2Excel(List<Map> list)throws Exception;
}
--
Gitblit v1.9.2