bug修改

mitao

2025-01-22 e5bdccc3acf92c9a72ec4352845130068ae1bbe4

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

@@ -13,7 +13,8 @@
import com.ruoyi.company.api.domain.dto.MgtCompanyDTO;
import com.ruoyi.company.api.domain.excel.MgtCompanyExcel;
import com.ruoyi.company.api.domain.query.MgtCompanyQuery;
import com.ruoyi.company.api.domain.vo.MgtCompanyVO;
import com.ruoyi.company.domain.vo.MgtCompanyDetailVO;
import com.ruoyi.company.domain.vo.MgtCompanyVO;
import com.ruoyi.company.mapper.CompanyMapper;
import com.ruoyi.company.service.CompanyService;
import com.ruoyi.company.service.UserService;
@@ -72,11 +73,11 @@
     * @return
     */
    @Override
    public MgtCompanyVO queryCompanyDetail(Long id) {
    public MgtCompanyDetailVO queryCompanyDetail(Long id) {
        Company company = this.getById(id);
        MgtCompanyVO mgtCompanyVO = BeanUtils.copyBean(company, MgtCompanyVO.class);
        MgtCompanyDetailVO mgtCompanyVO = BeanUtils.copyBean(company, MgtCompanyDetailVO.class);
        if (Objects.isNull(mgtCompanyVO)) {
            mgtCompanyVO = new MgtCompanyVO();
            mgtCompanyVO = new MgtCompanyDetailVO();
            return mgtCompanyVO;
        }
        User user = userService.getById(company.getUserId());
@@ -109,9 +110,9 @@
        Company company = BeanUtils.copyBean(dto, Company.class);
        company.setUserId(user.getUserId());
        //根据公司名称查询数据库
        Long count = this.lambdaQuery().eq(Company::getCompanyName, company.getCompanyName()).count();
        Long count = this.lambdaQuery().eq(Company::getCompanyName, company.getCompanyName()).eq(Company::getSocialCode, dto.getSocialCode()).count();
        if (count > 0) {
            throw new ServiceException("该公司账号已存在");
            throw new ServiceException("该企业已存在");
        }
        //身份证二要素校验
        Boolean res = aliyunCloudAuthUtil.verifyIdCard(dto.getLegalPersonName(), dto.getIdCardNumber());
@@ -157,10 +158,11 @@
        if (StringUtils.isNotBlank(company.getCompanyName())){
            Long count = this.lambdaQuery()
                    .ne(Company::getId, dto.getId())
                    .eq(Company::getCompanyName, company.getCompanyName())
                    .eq(Company::getSocialCode, company.getSocialCode())
                    .eq(Company::getCompanyName, dto.getCompanyName())
                    .count();
            if (count > 0) {
                throw new ServiceException("该公司账号已存在");
                throw new ServiceException("该企业已存在");
            }
        }
        //身份证二要素校验