From db523e0fdf7801cdc01f10886f2c9aec04e711bb Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Thu, 25 Feb 2021 11:21:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java
index 449dc3d..1337895 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java
@@ -43,7 +43,7 @@
SysUserDao sysUserDao;
@Transactional(propagation = Propagation.REQUIRED)
- public List<SysUser> getSysUserList(String arp, String name,String departmentName, Integer first, Integer pageSize) {
+ public List<SysUser> getSysUserList(String arp, String name,String departmentName,String project,String company, Integer first, Integer pageSize) {
try {
Map<String, Object> params = new HashMap<String, Object>();
if (StringUtils.isNotBlank(arp)) {
@@ -55,6 +55,8 @@
if (StringUtils.isNotBlank(departmentName)) {
params.put("departmentNameLike", "%" + departmentName + "%");
}
+ params.put("project", project);
+ params.put("company", company);
params.put("first", first);
params.put("pageSize", pageSize);
return this.sysUserDao.getSysUserList(params);
@@ -64,7 +66,7 @@
}
}
@Transactional(propagation = Propagation.REQUIRED)
- public int getSysUserTotalCount(String arp, String name,String departmentName) {
+ public int getSysUserTotalCount(String arp, String name,String departmentName,String project,String company) {
try {
Map<String, Object> params = new HashMap<String, Object>();
if (StringUtils.isNotBlank(arp)) {
@@ -76,11 +78,35 @@
if (StringUtils.isNotBlank(departmentName)) {
params.put("departmentNameLike", "%" + departmentName + "%");
}
+ params.put("project", project);
+ params.put("company", company);
return this.sysUserDao.getSysUserTotalCount(params);
} catch (DataAccessException e) {
logger.error(e.getMessage(), e);
throw new BusinessException(ExceptionEnumCode.DB_ERR, MessageUtil.getMessageByCode(ExceptionEnumCode.DB_ERR.getCode()), e);
}
+ }
+
+ @Override
+ public int getUserCountInProject(String arp, String name, String departmentName, String project, String company) {
+ Map<String, Object> params = new HashMap<String, Object>();
+ params.put("arp", arp);
+ params.put("name", name);
+ params.put("departmentNameLike", departmentName);
+ params.put("project", project);
+ params.put("company", company);
+ return sysUserDao.getUserCountInProject(params);
+ }
+
+ @Override
+ public List<SysUser> getUserInProject(String arp, String name, String departmentName, String project, String company, Integer first, Integer pageSize) {
+ Map<String, Object> params = new HashMap<String, Object>();
+ params.put("arp", arp);
+ params.put("name", name);
+ params.put("departmentNameLike", departmentName);
+ params.put("project", project);
+ params.put("company", company);
+ return sysUserDao.getUserInProject(params);
}
@Transactional(propagation = Propagation.REQUIRED)
@@ -285,9 +311,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){
@@ -353,9 +379,10 @@
}
@Override
- public HazardousWasteUser 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);
}
@@ -364,5 +391,10 @@
return sysUserDao.getUserByProject(project);
}
+ @Override
+ public List<SysUser> getUserByArp(String arp) {
+ return sysUserDao.getUserByArp(arp);
+ }
+
}
--
Gitblit v1.9.2