From 3222d83845148e2479af6aeb0f029def5f28f8b2 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 25 Mar 2024 12:34:53 +0800
Subject: [PATCH] Merge branch 'jc' of http://s16s652780.51mypc.cn:49896/r/zhba_management_w_bf into jc
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 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 5c4ba7b..e808b88 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
@@ -196,6 +196,17 @@
//机构名称拼接
userVOS.forEach(userVO -> {
if (null!=userVO.getDeptId()) {
+ String deptIds = "";
+ if (userVO.getAncestors() != null){
+ deptIds = userVO.getAncestors()+","+userVO.getDeptId();
+ }else{
+ deptIds = userVO.getDeptId();
+ }
+
+ List<String> deptNameList = SysCache.getDeptNames(deptIds);
+
+ userVO.setFullDeptName(getFullDeptName(deptNameList));
+
List<String> list = baseMapper.getDeptName(userVO.getDeptId());
if (list.size() > 1) {
if (null != list.get(1) && list.get(1) != "") {
@@ -213,12 +224,34 @@
if (list.size() == 1) {
userVO.setDeptName(list.get(0));
}
+
+
+
+
}
});
return page.setRecords(userVOS);
}
}
+ private String getFullDeptName(List<String> deptNameList) {
+ String fullDeptName = "";
+ if (deptNameList != null){
+ if (deptNameList.size()>1){
+ //多级
+ if (StringUtil.isNotBlank(deptNameList.get(0))){
+ //本市保安公司 xxx xxx xxx
+ String first = deptNameList.get(0);
+ if (first.equals("本市保安公司") || first.equals("保安培训学校") || first.equals("自招保安单位") || first.equals("武装押运公司") || first.equals("分公司") || first.equals("其他")){
+ deptNameList.remove(0);
+ fullDeptName = StringUtil.join(deptNameList,",");
+ }
+ }
+ }
+ }
+ return fullDeptName;
+ }
+
@Override
public IPage<UserVO> selectUserPage(IPage<UserVO> page, User user, Long deptId, String tenantId) {
List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
--
Gitblit v1.9.3