feat: 修复统计

wlzboy

5 天以前 fe33646ee6e2d1e57f2b51812e94983a0e9efb04

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -117,6 +117,18 @@
    }

    /**
     * 通过手机号查询用户
     * 
     * @param phonenumber 手机号
     * @return 用户对象信息
     */
    @Override
    public SysUser selectUserByPhonenumber(String phonenumber)
    {
        return userMapper.selectUserByPhonenumber(phonenumber);
    }

    /**
     * 通过用户ID查询用户
     * 
     * @param userId 用户ID
@@ -126,6 +138,30 @@
    public SysUser selectUserById(Long userId)
    {
        return userMapper.selectUserById(userId);
    }
    
    /**
     * 通过微信OpenID查询用户
     * 
     * @param openId 微信OpenID
     * @return 用户对象信息
     */
    @Override
    public SysUser selectUserByOpenId(String openId)
    {
        return userMapper.selectUserByOpenId(openId);
    }
    
    /**
     * 根据oaUserId查询用户
     * 
     * @param oaUserId SQL Server中的OA用户ID
     * @return 用户信息
     */
    @Override
    public SysUser selectUserByOaUserId(Integer oaUserId)
    {
        return userMapper.selectUserByOaUserId(oaUserId);
    }

    /**
@@ -503,6 +539,31 @@
                {
                    BeanValidators.validateWithException(validator, user);
                    deptService.checkDeptDataScope(user.getDeptId());
                    
                    // 校验手机号唯一性
                    if (StringUtils.isNotEmpty(user.getPhonenumber()))
                    {
                        SysUser phoneCheck = userMapper.checkPhoneUnique(user.getPhonenumber());
                        if (StringUtils.isNotNull(phoneCheck))
                        {
                            failureNum++;
                            failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 导入失败：手机号码 " + user.getPhonenumber() + " 已被用户 " + phoneCheck.getUserName() + " 使用");
                            continue;
                        }
                    }
                    
                    // 校验邮箱唯一性
                    if (StringUtils.isNotEmpty(user.getEmail()))
                    {
                        SysUser emailCheck = userMapper.checkEmailUnique(user.getEmail());
                        if (StringUtils.isNotNull(emailCheck))
                        {
                            failureNum++;
                            failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 导入失败：邮箱 " + user.getEmail() + " 已被用户 " + emailCheck.getUserName() + " 使用");
                            continue;
                        }
                    }
                    
                    String password = configService.selectConfigByKey("sys.user.initPassword");
                    user.setPassword(SecurityUtils.encryptPassword(password));
                    user.setCreateBy(operName);
@@ -516,6 +577,31 @@
                    checkUserAllowed(u);
                    checkUserDataScope(u.getUserId());
                    deptService.checkDeptDataScope(user.getDeptId());
                    
                    // 校验手机号唯一性（排除自己）
                    if (StringUtils.isNotEmpty(user.getPhonenumber()))
                    {
                        SysUser phoneCheck = userMapper.checkPhoneUnique(user.getPhonenumber());
                        if (StringUtils.isNotNull(phoneCheck) && !phoneCheck.getUserId().equals(u.getUserId()))
                        {
                            failureNum++;
                            failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 更新失败：手机号码 " + user.getPhonenumber() + " 已被用户 " + phoneCheck.getUserName() + " 使用");
                            continue;
                        }
                    }
                    
                    // 校验邮箱唯一性（排除自己）
                    if (StringUtils.isNotEmpty(user.getEmail()))
                    {
                        SysUser emailCheck = userMapper.checkEmailUnique(user.getEmail());
                        if (StringUtils.isNotNull(emailCheck) && !emailCheck.getUserId().equals(u.getUserId()))
                        {
                            failureNum++;
                            failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 更新失败：邮箱 " + user.getEmail() + " 已被用户 " + emailCheck.getUserName() + " 使用");
                            continue;
                        }
                    }
                    
                    user.setUserId(u.getUserId());
                    user.setUpdateBy(operName);
                    userMapper.updateUser(user);
@@ -547,4 +633,20 @@
        }
        return successMsg.toString();
    }
    
    /**
     * 根据分公司ID列表查询用户（包含分公司及其所有子部门的用户）
     * 
     * @param branchDeptIds 分公司ID列表
     * @return 用户列表
     */
    @Override
    public List<SysUser> selectUsersByBranchDeptIds(List<Long> branchDeptIds)
    {
        if (branchDeptIds == null || branchDeptIds.isEmpty()) {
            return new ArrayList<>();
        }
        
        return userMapper.selectUsersByBranchDeptIds(branchDeptIds);
    }
}