From fe1845ba21d8e9908077ab0bb5a9a8137942a50b Mon Sep 17 00:00:00 2001 From: chenrui <1187576398@qq.com> Date: 星期二, 13 五月 2025 16:53:15 +0800 Subject: [PATCH] 开票台账前后端联调 --- src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java index a7bf99b..fd9df5a 100644 --- a/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java @@ -1,6 +1,7 @@ package com.ruoyi.project.system.service.impl; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.stream.Collectors; import javax.validation.Validator; @@ -28,6 +29,7 @@ import com.ruoyi.project.system.mapper.SysUserPostMapper; import com.ruoyi.project.system.mapper.SysUserRoleMapper; import com.ruoyi.project.system.service.ISysConfigService; +import com.ruoyi.project.system.service.ISysDeptService; import com.ruoyi.project.system.service.ISysUserService; /** @@ -57,6 +59,9 @@ @Autowired private ISysConfigService configService; + + @Autowired + private ISysDeptService deptService; @Autowired protected Validator validator; @@ -489,7 +494,6 @@ int failureNum = 0; StringBuilder successMsg = new StringBuilder(); StringBuilder failureMsg = new StringBuilder(); - String password = configService.selectConfigByKey("sys.user.initPassword"); for (SysUser user : userList) { try @@ -499,6 +503,8 @@ if (StringUtils.isNull(u)) { BeanValidators.validateWithException(validator, user); + deptService.checkDeptDataScope(user.getDeptId()); + String password = configService.selectConfigByKey("sys.user.initPassword"); user.setPassword(SecurityUtils.encryptPassword(password)); user.setCreateBy(operName); userMapper.insertUser(user); @@ -510,6 +516,7 @@ BeanValidators.validateWithException(validator, user); checkUserAllowed(u); checkUserDataScope(u.getUserId()); + deptService.checkDeptDataScope(user.getDeptId()); user.setUserId(u.getUserId()); user.setUpdateBy(operName); userMapper.updateUser(user); @@ -541,4 +548,14 @@ } return successMsg.toString(); } + + /** + * 涓嶅垎椤电敤鎴锋煡璇� + * @param user + * @return + */ + @Override + public List<SysUser> userListNoPage(SysUser user) { + return userMapper.selectUserList(user); + } } -- Gitblit v1.9.3