From 178788d231d7d891c1874635b8e11dd951fc4230 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 25 六月 2021 18:10:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 src/main/java/com/nanometer/smartlab/dao/SysUserDao.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/dao/SysUserDao.java b/src/main/java/com/nanometer/smartlab/dao/SysUserDao.java
index 010a62b..c9591fe 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysUserDao.java
+++ b/src/main/java/com/nanometer/smartlab/dao/SysUserDao.java
@@ -57,4 +57,11 @@
     int getUserCountInProject(Map params);
 
     List<SysUser> getUserInProject(Map params);
+
+    List<Map> getExportUserList(@Param("arp") String arp,@Param("name") String name, @Param("departmentName") String departmentName,
+                                @Param("project") String project,@Param("company") String company);
+
+    List<String> getLibrarianEmail();
+
+    List<SysUser> getUserByName(String approveUserName);
 }

--
Gitblit v1.9.2