diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/ding/constants/DingOrganizationContant.java b/pmapi/src/main/java/com/ningdatech/pmapi/ding/constants/DingOrganizationContant.java index cfc755d..496b75f 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/ding/constants/DingOrganizationContant.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/ding/constants/DingOrganizationContant.java @@ -8,6 +8,7 @@ package com.ningdatech.pmapi.ding.constants; */ public interface DingOrganizationContant { - public static final String UNIT_TYPE = "GOV_UNIT"; + String UNIT_TYPE = "GOV_UNIT"; + String HOLLOW = "GOV_HOLLOW_DIVISION_NODE"; } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/manage/OrganizationManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/manage/OrganizationManage.java index eb5a8ce..dde0d77 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/organization/manage/OrganizationManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/manage/OrganizationManage.java @@ -5,10 +5,12 @@ import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.google.common.collect.Lists; import com.ningdatech.basic.model.PageVo; import com.ningdatech.pmapi.common.config.DingOrganizationProperties; import com.ningdatech.pmapi.common.helper.RegionCacheHelper; import com.ningdatech.pmapi.common.util.StrUtils; +import com.ningdatech.pmapi.ding.constants.DingOrganizationContant; import com.ningdatech.pmapi.fiscal.service.ICompanyFiscalCodeService; import com.ningdatech.pmapi.organization.model.entity.DingEmployeeInfo; import com.ningdatech.pmapi.organization.model.entity.DingOrganization; @@ -152,7 +154,8 @@ public class OrganizationManage { if (StringUtils.isNotBlank(organizationName)) { dingOrganizationList = iDingOrganizationService.list(Wrappers.lambdaQuery(DingOrganization.class) .like(DingOrganization::getOrganizationName, organizationName) - .notIn(onlyUnit, DingOrganization::getTypeCode, "GOV_INTERNAL_INSTITUTION")); + .in(onlyUnit, DingOrganization::getTypeCode, Lists.newArrayList(DingOrganizationContant.UNIT_TYPE, + DingOrganizationContant.HOLLOW))); if (dingOrganizationList.size() == 0) { return new ArrayList<>(); }