From c87fb558bc1cf1c007f2a0a8a73943889e6baa62 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 14 Jun 2022 17:42:42 +0800
Subject: [PATCH] 证件编号导入修改
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 759d9d5..413865b 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
@@ -347,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) {
@@ -1270,8 +1274,11 @@
String deptIds = userDeptService.selectIn(user.getDeptId());
if (null!=deptIds && !deptIds.equals("")) {
if (null != deptId && !deptId.equals("")) {
+ //管理员不分单位导入
if (!deptId.equals(deptIds)) {
- throw new ServiceException("导入失败!不能导入不是本公司的保安员数据!");
+ if(!deptId.equals("1123598813738675201")) {
+ throw new ServiceException("导入失败!不能导入不是本公司的保安员数据!");
+ }
}
}
user.setDeptId(deptIds);
--
Gitblit v1.9.3