From 950264a579736c1c51f1efe4baf0ac1476d5748c Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 02 十二月 2024 11:06:46 +0800
Subject: [PATCH] bug修改
---
finance-system/src/main/java/com/finance/system/service/impl/SysUserServiceImpl.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/finance-system/src/main/java/com/finance/system/service/impl/SysUserServiceImpl.java b/finance-system/src/main/java/com/finance/system/service/impl/SysUserServiceImpl.java
index ce57ad9..98c4359 100644
--- a/finance-system/src/main/java/com/finance/system/service/impl/SysUserServiceImpl.java
+++ b/finance-system/src/main/java/com/finance/system/service/impl/SysUserServiceImpl.java
@@ -7,6 +7,7 @@
import com.finance.common.constant.UserConstants;
import com.finance.common.core.domain.entity.SysRole;
import com.finance.common.core.domain.entity.SysUser;
+import com.finance.common.enums.AreaLevelEnum;
import com.finance.common.enums.UserTypeEnum;
import com.finance.common.exception.ServiceException;
import com.finance.common.utils.BeanUtils;
@@ -14,6 +15,7 @@
import com.finance.common.utils.StringUtils;
import com.finance.common.utils.bean.BeanValidators;
import com.finance.common.utils.spring.SpringUtils;
+import com.finance.system.domain.Region;
import com.finance.system.domain.SysPost;
import com.finance.system.domain.SysUserPost;
import com.finance.system.domain.SysUserRole;
@@ -23,6 +25,7 @@
import com.finance.system.mapper.SysUserPostMapper;
import com.finance.system.mapper.SysUserRoleMapper;
import com.finance.system.query.SysUserQuery;
+import com.finance.system.service.IRegionService;
import com.finance.system.service.ISysConfigService;
import com.finance.system.service.ISysUserService;
import com.finance.system.vo.DeptVO;
@@ -70,6 +73,8 @@
@Autowired
protected Validator validator;
+ @Autowired
+ private IRegionService regionService;
/**
* 根据条件分页查询用户列表
@@ -623,6 +628,15 @@
deptName)
.orderByDesc(SysUser::getCreateTime)
.list();
- return BeanUtils.copyList(list, DeptVO.class);
+ List<DeptVO> deptVOS = BeanUtils.copyList(list, DeptVO.class);
+ deptVOS = deptVOS.stream()
+ .filter(item -> null != item.getAreaLevel() && item.getAreaLevel()
+ .equals(AreaLevelEnum.COUNTY)).peek(item -> {
+ Region region = regionService.getParentByCode(item.getAreaCode());
+ if (region != null) {
+ item.setCityName(region.getName());
+ }
+ }).collect(Collectors.toList());
+ return deptVOS;
}
}
--
Gitblit v1.7.1