Merge remote-tracking branch 'origin/master'

mitao

2025-01-21 15d6d20c8f5e36f79b420cf6ebdcbbf41cb2cdc8

 ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/service/impl/CompanyServiceImpl.java

@@ -34,9 +34,11 @@
public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> implements CompanyService {
    private final UserService userService;
    private final HttpServletResponse response;

    private final AliyunCloudAuthUtil aliyunCloudAuthUtil;
    /**
     * 获取企业列表
     *
     * @param query
     * @return
     */
@@ -65,6 +67,7 @@

    /**
     * 获取企业详情
     *
     * @param id
     * @return
     */
@@ -86,6 +89,7 @@

    /**
     * 新增企业
     *
     * @param dto
     * @return
     */
@@ -99,6 +103,7 @@
        //添加用户信息
        User user = BeanUtils.copyBean(dto, User.class);
        user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
        user.setCreateBy(SecurityUtils.getUserId());
        userService.save(user);

        Company company = BeanUtils.copyBean(dto, Company.class);
@@ -118,11 +123,12 @@

    /**
     * 编辑企业
     *
     * @param dto
     */
    @Override
    public void editCompany(MgtCompanyDTO dto) {
        if (Objects.isNull(dto.getId())){
        if (Objects.isNull(dto.getId())) {
            throw new ServiceException("企业id不能为空");
        }
        //查询企业
@@ -141,12 +147,14 @@
        }
        //用户信息
        User userUpd = BeanUtils.copyBean(dto, User.class);
        userUpd.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
        if (StringUtils.isNotBlank(dto.getPassword())) {
            userUpd.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
        }
        userUpd.setUserId(user.getUserId());
        userUpd.setUpdateBy(SecurityUtils.getUserId());
        userService.updateById(userUpd);
        //根据公司名称查询数据库
        Long count = this.lambdaQuery().ne(Company::getId,dto.getId()).eq(Company::getCompanyName, company.getCompanyName()).count();
        Long count = this.lambdaQuery().ne(Company::getId, dto.getId()).eq(Company::getCompanyName, company.getCompanyName()).count();
        if (count > 0) {
            throw new ServiceException("该公司账号已存在");
        }
@@ -162,6 +170,7 @@

    /**
     * 删除企业
     *
     * @param id
     */
    @Override
@@ -172,7 +181,7 @@
            throw new ServiceException("删除失败，该企业不存在");
        }
        //删除企业账号
         userService.removeById(company.getUserId());
        userService.removeById(company.getUserId());

        //删除企业信息
        this.removeById(id);
@@ -182,16 +191,24 @@
    @Override
    public void export(MgtCompanyQuery query) throws IOException {
        List<Company> list = this.lambdaQuery()
                .like(StringUtils.isNotBlank(query.getCompanyInfo()), Company::getCompanyName, query.getCompanyInfo())
                .like(StringUtils.isNotBlank(query.getCompanyInfo()), Company::getSocialCode, query.getCompanyInfo())
                .like(StringUtils.isNotBlank(query.getLegalPersonInfo()), Company::getLegalPersonName, query.getLegalPersonInfo())
                .like(StringUtils.isNotBlank(query.getLegalPersonInfo()), Company::getIdCardNumber, query.getLegalPersonInfo())
                .like(StringUtils.isNotBlank(query.getContactInfo()), Company::getContactName, query.getContactInfo())
                .like(StringUtils.isNotBlank(query.getContactInfo()), Company::getContactPhone, query.getContactInfo()).list();
                .and(StringUtils.isNotBlank(query.getCompanyInfo()),
                        queryWrapper -> queryWrapper
                                .like(Company::getCompanyName, query.getCompanyInfo())
                                .or()
                                .like(Company::getSocialCode, query.getCompanyInfo()))
                .and(StringUtils.isNotBlank(query.getLegalPersonInfo()),
                        queryWrapper -> queryWrapper
                                .like(Company::getLegalPersonName, query.getLegalPersonInfo())
                                .or()
                                .like(Company::getIdCardNumber, query.getLegalPersonInfo()))
                .and(StringUtils.isNotBlank(query.getContactInfo()),
                        queryWrapper -> queryWrapper
                                .like(Company::getContactName, query.getContactInfo())
                                .or()
                                .like(Company::getContactPhone, query.getContactInfo()))
                .orderByDesc(Company::getCreateTime).list();
        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
        response.setCharacterEncoding

                ("utf-8");
        response.setCharacterEncoding("utf-8");
        String fileName = URLEncoder.encode("企业信息导出数据", "UTF-8").replaceAll("\\+", "%20");
        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");