From af607e09de61badbaef57bc0d38002e48a44ac4c Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 12 十一月 2021 12:48:50 +0800
Subject: [PATCH] 订单领取申领人被删除报错
---
src/main/java/com/nanometer/smartlab/service/SysUserService.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysUserService.java b/src/main/java/com/nanometer/smartlab/service/SysUserService.java
index 89e4772..2a649fe 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysUserService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysUserService.java
@@ -14,15 +14,17 @@
*/
public interface SysUserService {
- List<SysUser> getSysUserList(String arp, String name,String departmentName, Integer first, Integer pageSize);
- int getSysUserTotalCount(String arp, String name,String departmentName);
+ List<SysUser> getSysUserList(String arp, String name,String departmentName,String project,String company,Integer first, Integer pageSize);
+ 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);
SysUser getSysUser(String id);
SysUser getSysUserForSuppllier(String id);
SysUser getSysUserByAccount(String account);
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);
@@ -35,13 +37,23 @@
public int insertSysUserList(List<SysUser> userList);
- Map getUser(String id);
+ SysUser getUser(String id);
void updateUserFavor(SysReagent reagent, SysUser user) throws Exception;
List<SysUserDto> getUserInfo();
- HazardousWasteUser getUserByAccount(String account);
+ HazardousWasteUser getUserByAccount(String account,String name);
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