改bug

MrShi

11 小时以前 1c20c8231980a8d4b91688ff8641a06d3b2f68ab

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

@@ -97,7 +97,7 @@
                throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "对不起，父级组织信息尚未同步下发成功~");
            }
            if(Objects.nonNull(parent.getType())&&!Constants.equalsInteger(parent.getType(),-1)){
                if(Constants.equalsInteger(company.getType(),parent.getType())){
                if(!Constants.equalsInteger(company.getType(),parent.getType())){
                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，组织信息错误");
                }
            }else if(Objects.isNull(parent.getType())){
@@ -585,7 +585,7 @@
        queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getStatus()),Company::getStatus,Constants.ZERO);
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Company::getName,pageWrap.getModel().getName());
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getParentName()),"c.name",pageWrap.getModel().getParentName());
        queryWrapper.orderByAsc(Company::getPinyin);
        queryWrapper.orderByAsc(Company::getSortnum);
        IPage<Company> companyIPage = companyJoinMapper.selectJoinPage(page, Company.class, queryWrapper);
        return PageData.from(companyIPage);
    }
@@ -615,7 +615,7 @@

        wrapper.eq(Company::getIsdeleted,Constants.ZERO)
                .eq(Constants.equalsInteger(type,Constants.ONE),Company::getType,type)
                .orderByAsc(Company::getPinyin);
                .orderByAsc(Company::getSortnum);
        List<Company> companies = companyMapper.selectList(wrapper);
        return getCompanyTree( companies, null);
    }
@@ -697,7 +697,7 @@
        queryWrapper.eq(Company::getIsdeleted,Constants.ZERO);
        if(Objects.nonNull(type) && ( Constants.equalsInteger(type,Constants.ONE) || Constants.equalsInteger(type,Constants.ZERO))){
//            queryWrapper.eq(type!=null,Company::getType,type);
            queryWrapper.apply("( type = "+type+" or type  = -1  )");
            queryWrapper.apply("( t.type = "+type+" or t.type  = -1  )");
        }else if(Objects.nonNull(type) &&  Constants.equalsInteger(type,Constants.TWO)){
            String companySpecialId = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SPECIAL_COMPANY_ID).getCode();
            if(StringUtils.isNotBlank(companySpecialId)){