From d79a50e85f7a175f30296126f7180f71aeae71ec Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 14 Jun 2022 17:02:52 +0800
Subject: [PATCH] 保安员导入新增管理员无差别单位导入
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 6d95a07..c881378 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -59,10 +59,7 @@
import org.springblade.modules.securitypaper.entity.SecurityPaper;
import org.springblade.modules.securitypaper.service.SecurityPaperService;
import org.springblade.modules.system.entity.*;
-import org.springblade.modules.system.excel.QrCodeExcel;
-import org.springblade.modules.system.excel.SecurityExcel;
-import org.springblade.modules.system.excel.SecurityYyExcel;
-import org.springblade.modules.system.excel.UserExcel;
+import org.springblade.modules.system.excel.*;
import org.springblade.modules.system.mapper.UserMapper;
import org.springblade.modules.system.node.TreeNode;
import org.springblade.modules.system.service.*;
@@ -350,8 +347,12 @@
@Override
public UserInfo userInfo(String tenantId, String account, String password, UserEnum userEnum) {
- User user = baseMapper.getUser(tenantId, account, password);
- return buildUserInfo(user, userEnum);
+ try {
+ User user = baseMapper.getUser(tenantId, account, password);
+ return buildUserInfo(user, userEnum);
+ }catch (Exception e){
+ throw new ServiceException("账号["+account+"]"+"重复!");
+ }
}
private UserInfo buildUserInfo(User user) {
@@ -1273,7 +1274,8 @@
String deptIds = userDeptService.selectIn(user.getDeptId());
if (null!=deptIds && !deptIds.equals("")) {
if (null != deptId && !deptId.equals("")) {
- if (!deptId.equals(deptIds)) {
+ //管理员不分单位导入
+ if (!deptId.equals(deptIds) && !deptId.equals("1123598813738675201")) {
throw new ServiceException("导入失败!不能导入不是本公司的保安员数据!");
}
}
@@ -2303,7 +2305,7 @@
* @return
*/
@Override
- public List<SecurityExcel> exportSecurityInfo(UserVO user) {
+ public List<ExportSecurityExcel> exportSecurityInfo(UserVO user) {
return baseMapper.exportSecurityInfo(user);
}
--
Gitblit v1.9.3