From b02535c9a99324823812f6c2d08f066d8e1ba75f Mon Sep 17 00:00:00 2001 From: gdg <764716047@qq.com> Date: 星期一, 18 一月 2021 09:57:14 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master --- src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java index 3f5683a..2edb936 100644 --- a/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java +++ b/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java @@ -4,6 +4,8 @@ import com.nanometer.smartlab.dao.SysUserDao; import com.nanometer.smartlab.entity.SysReagent; import com.nanometer.smartlab.entity.SysUser; +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.entity.enumtype.ApproverFlag; import com.nanometer.smartlab.entity.enumtype.SeeFlag; @@ -351,11 +353,17 @@ } @Override - public SysUser getUserByAccount(String account) { + public HazardousWasteUser getUserByAccount(String account,String name) { Map<String, String> params = new HashMap<>(); params.put("account", account); + params.put("name", name); return sysUserDao.getUserByAccount(params); } + @Override + public List<LaboratoryVo.LaboratoryUser> getUserByProject(String project) { + return sysUserDao.getUserByProject(project); + } + } -- Gitblit v1.9.2