From 31ffbaf322685984516cfb284fa58741debf4e96 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Fri, 29 Jan 2021 09:12:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/java/com/nanometer/smartlab/service/SysUserService.java | 6 +++---
1 files changed, 3 insertions(+), 3 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..5fd2f5b 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysUserService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysUserService.java
@@ -14,8 +14,8 @@
*/
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);
SysUser getSysUser(String id);
SysUser getSysUserForSuppllier(String id);
SysUser getSysUserByAccount(String account);
@@ -41,7 +41,7 @@
List<SysUserDto> getUserInfo();
- HazardousWasteUser getUserByAccount(String account);
+ HazardousWasteUser getUserByAccount(String account,String name);
List<LaboratoryVo.LaboratoryUser> getUserByProject(String project);
}
--
Gitblit v1.9.2