From 4d3856e802d5c9d28d8654f35da426bdb517d7d4 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期一, 21 六月 2021 10:32:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/nanometer/smartlab/dao/SysUserDao.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysUserDao.java b/src/main/java/com/nanometer/smartlab/dao/SysUserDao.java
index 99ab04a..c0bd43b 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysUserDao.java
+++ b/src/main/java/com/nanometer/smartlab/dao/SysUserDao.java
@@ -35,7 +35,7 @@
public SysUser selectByAccount(SysUser user);
- Map getUser(String id);
+ SysUser getUser(String id);
void insertUserFavor(Map params);
@@ -57,4 +57,10 @@
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();
+
}
--
Gitblit v1.9.2