From bc1f282f1cc9bdad3225ec8d1acea44d7835aba6 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 15 Nov 2021 14:00:49 +0800
Subject: [PATCH] 1.分公司权限
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 57 insertions(+), 0 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 082b299..3dd6146 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
@@ -188,6 +188,25 @@
} else {
userVO.setAge(null);
}
+ if (null!=userVO.getDeptId()) {
+ List<String> list = baseMapper.getDeptName(userVO.getDeptId());
+ if (list.size() > 1) {
+ if (null != list.get(1) && list.get(1) != "") {
+ String s = list.get(1).toString();
+ if (s.equals("本市保安公司") || s.equals("保安培训学校") || s.equals("自招保安单位") || s.equals("武装押运公司") || s.equals("分公司") || s.equals("其他")){
+ userVO.setDeptName(list.get(0));
+ }
+ else {
+ userVO.setDeptName(list.get(1) + "," + list.get(0));
+ }
+ } else {
+ userVO.setDeptName(list.get(0));
+ }
+ }
+ if (list.size() == 1) {
+ userVO.setDeptName(list.get(0));
+ }
+ }
});
return page.setRecords(userVOS);
}
@@ -955,6 +974,44 @@
}
+// /**
+// * 导入保安员（测试，用来更新数据用）
+// *
+// * @param data
+// * @param isCovered
+// */
+// @Override
+//// @Transactional(rollbackFor = Exception.class)
+// public void importSecurity(List<SecurityExcel> data, Boolean isCovered, String deptId) {
+// //将不能导入的保安员账号存起来
+// List<String> errorList = new ArrayList<>();
+// //导入状态，默认为true ,如果有一个出现问题则为 false
+// AtomicBoolean status = new AtomicBoolean(true);
+// data.forEach(userExcel -> {
+// //判断当前用户是否已在本单位，如果是的更新数据
+// User user1 = new User();
+// user1.setAccount(userExcel.getCardid());
+// user1.setIsDeleted(0);
+// user1.setStatus(1);
+// User user2 = this.getOne(Condition.getQueryWrapper(user1));
+// if (null!=user2){
+// if (null!=userExcel.getRegistered() && userExcel.getRegistered()!=""){
+// user2.setRegistered(userExcel.getRegistered());
+// user2.setUserType(7);
+// }
+// this.updateById(user2);
+// }else {
+// errorList.add(userExcel.getCardid());
+// }
+// });
+// //如果所有数据导入有一个异常
+// if (!status.get()){
+// String errorAccount = StringUtils.join(errorList, "\\\n");
+// throw new ServiceException("用户:["+errorAccount+"]导入失败!已在其他单位存在!");
+// }
+// }
+
+
/**
* 根据保安员编码查询保安信息
*
--
Gitblit v1.9.3