Browse Source

单位树 改造

master
PoffyZhang 1 year ago
parent
commit
afc3be7a68
2 changed files with 6 additions and 2 deletions
  1. +2
    -1
      pmapi/src/main/java/com/ningdatech/pmapi/ding/constants/DingOrganizationContant.java
  2. +4
    -1
      pmapi/src/main/java/com/ningdatech/pmapi/organization/manage/OrganizationManage.java

+ 2
- 1
pmapi/src/main/java/com/ningdatech/pmapi/ding/constants/DingOrganizationContant.java View File

@@ -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";
}

+ 4
- 1
pmapi/src/main/java/com/ningdatech/pmapi/organization/manage/OrganizationManage.java View File

@@ -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<>();
}


Loading…
Cancel
Save