From ea2b42d0ab6cd96118ddb030bbc3901149d6aaa7 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: Wed, 27 Oct 2021 16:59:36 +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 8915b4d..2a649fe 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysUserService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysUserService.java
@@ -24,7 +24,7 @@
SysUser getSysUserByIdCard(String idCard);
boolean isSysUserExist(String arp, String account, String idCard, String editId);
List<SysUser> getApproverUserList(String department);
- List<SysUser> getHasProjectSysUserList(String department);
+ List<SysUser> getHasProjectSysUserList(String department,String project);
List<SysUser> getApplyUserList();
List<SysUser> getSeeUserList(String department);
SysUser insertSysUser(SysUser sysUser);
@@ -52,4 +52,8 @@
List<Map> getExportUserList(String arp, String name, String departmentName, String project, String company);
void exportUser2Excel(List<Map> list)throws Exception;
+
+ List<String> getLibrarianEmail();
+
+ SysUser getUserByName(String approveUserName);
}
--
Gitblit v1.9.2