jiangping
2025-04-14 417b355cf5b25c0dced403abb99aa152d219e9db
Merge remote-tracking branch 'origin/master'
已修改1个文件
4 ■■■■ 文件已修改
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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())){
@@ -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)){