From 9c9503de4fb1e1b0127f83c8b2b0f645c6ab9e9c Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期四, 21 一月 2021 11:20:53 +0800
Subject: [PATCH] 修改处理报警接口
---
src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java
index 58ffc46..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;
@@ -283,9 +285,9 @@
if (userList.size()>0) {
for (SysUser user:userList) {
if (this.isSysUserExist(user.getArp(), null, null, null)) {
-
+ throw new DuplicateKeyException("arp重复");
}else if(!com.alibaba.druid.util.StringUtils.isEmpty(user.getIdCard()) && this.isSysUserExist(null, null, user.getIdCard(), null)){
-
+ throw new DuplicateKeyException("idCard为空或重复");
}else {
SysUser sysUser=sysUserDao.selectByAccount(user);
if(sysUser==null){
@@ -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