休bug

jiangping

2023-09-18 69c65dda53f5fa7007130e6a7339666b5b5ef52a

 server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java

@@ -88,14 +88,15 @@
        if (Objects.nonNull(company1)){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"企业已存在请重新输入");
        }

        wrapper.clear();
        wrapper.lambda()
                .eq(Company::getDeleted,Boolean.FALSE)
                .eq(Company::getCreditCode,company.getCreditCode());
        Company company2 = companyMapper.selectOne(wrapper);
        if (Objects.nonNull(company2)){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"企业已存在请重新输入");
        if(StringUtils.isNotBlank(company.getCreditCode())){
            wrapper.clear();
            wrapper.lambda()
                    .eq(Company::getDeleted,Boolean.FALSE)
                    .eq(Company::getCreditCode,company.getCreditCode());
            Company company2 = companyMapper.selectOne(wrapper);
            if (Objects.nonNull(company2)){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"企业统一社会信用代码已存在请重新输入");
            }
        }
        Company insert = new Company();
        insert.setDeleted((byte)Constants.ZERO);
@@ -114,6 +115,7 @@
        insert.setOepnValidDate(company.getOepnValidDate());
        insert.setOepnType(company.getOepnType());
        insert.setSalesmanId(company.getSalesmanId());
        insert.setStatus(Constants.ZERO);
        companyMapper.insert(insert);
        //创建企业用户
        SystemUser companyUser = createCompanyUser(company.getManagerUserName(), insert.getId());
@@ -139,6 +141,7 @@

        QueryWrapper<SystemUser> query = new QueryWrapper<>();
        query.lambda()
                .eq(SystemUser::getType,Constants.ONE)
                .eq(SystemUser::getDeleted,Boolean.FALSE)
                .eq(SystemUser::getUsername,managerUserName);
        Integer integer = systemUserMapper.selectCount(query);
@@ -192,6 +195,8 @@
                        .set(Company::getShortName,company.getShortName())
                        .set(Company::getCreditCode,company.getCreditCode())
                        .set(Company::getSalesmanId,company.getSalesmanId())
                        .set(company.getOepnValidDate()!=null,Company::getOepnValidDate,company.getOepnValidDate())
                        .set(company.getUserNum()!=null,Company::getUserNum,company.getUserNum())
                        .set(Company::getLinkname,company.getLinkname())
                        .set(Company::getLinkephone,company.getLinkephone());
        companyMapper.update(null,wrapper);
@@ -295,7 +300,7 @@
                "(select count(g.id) from goods g   where  g.COMPANY_ID = t.ID )goodsNum");
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Company::getName,pageWrap.getModel().getName())
                    .like(StringUtils.isNotBlank(pageWrap.getModel().getManagerUserName()),SystemUser::getUsername,pageWrap.getModel().getManagerUserName())
                    .eq(Objects.nonNull(pageWrap.getModel().getManagerUserName()),Company::getStatus,pageWrap.getModel().getStatus())
                    .eq(Objects.nonNull(pageWrap.getModel().getStatus()),Company::getStatus,pageWrap.getModel().getStatus())
                    .between((Objects.nonNull(pageWrap.getModel().getOepnValidDateStart()) && Objects.nonNull(pageWrap.getModel().getOepnValidDateEnd())),
                            Company::getOepnValidDate,pageWrap.getModel().getOepnValidDateStart(),pageWrap.getModel().getOepnValidDateEnd());
        return PageData.from(companyJoinMapper.selectJoinPage(page,Company.class,queryWrapper));