From dd8795a2675e32b25abe98f644f80d5f72fadb90 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期三, 01 十一月 2023 14:08:55 +0800
Subject: [PATCH] update icon

---
 src/main/java/com/nanometer/smartlab/service/SysUserService.java |   14 +++++++++++++-
 1 files changed, 13 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 4d591aa..246d72a 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysUserService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysUserService.java
@@ -5,7 +5,9 @@
 import com.nanometer.smartlab.entity.dto.HazardousWasteUser;
 import com.nanometer.smartlab.entity.dto.LaboratoryVo;
 import com.nanometer.smartlab.entity.dto.SysUserDto;
+import com.nanometer.smartlab.model.CommonPage;
 
+import java.net.Inet4Address;
 import java.util.List;
 import java.util.Map;
 
@@ -15,6 +17,8 @@
 public interface SysUserService {
 
     List<SysUser> getSysUserList(String arp, String name,String departmentName,String project,String company,Integer first, Integer pageSize);
+
+    CommonPage<SysUser> getSysUserList(Integer pageNum, Integer pageSize, String name);
     int getSysUserTotalCount(String arp, String name,String departmentName,String project,String company);
     int getUserCountInProject(String arp, String name,String departmentName,String project,String company);
     List<SysUser> getUserInProject(String arp, String name,String departmentName,String project,String company,Integer first, Integer pageSize);
@@ -24,7 +28,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);
@@ -48,4 +52,12 @@
     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;
+
+    List<String> getLibrarianEmail();
+
+    SysUser getUserByName(String approveUserName);
 }

--
Gitblit v1.9.2