From 6f0a523838b6af311ef8275e214d5fabf4dd2324 Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Mon, 24 Jul 2023 16:00:34 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=20code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ningdatech/pmapi/ding/constants/DingOrganizationContant.java | 2 +- .../com/ningdatech/pmapi/organization/manage/ProcDefManage.java | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) 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 496b75f..e8ffb0d 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 @@ -9,6 +9,6 @@ package com.ningdatech.pmapi.ding.constants; public interface DingOrganizationContant { String UNIT_TYPE = "GOV_UNIT"; - + String GOV_TEMPORARY = "GOV_TEMPORARY"; String HOLLOW = "GOV_HOLLOW_DIVISION_NODE"; } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/manage/ProcDefManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/manage/ProcDefManage.java index df538d6..60acd33 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/organization/manage/ProcDefManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/manage/ProcDefManage.java @@ -3,6 +3,7 @@ package com.ningdatech.pmapi.organization.manage; import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.google.common.collect.Lists; import com.ningdatech.basic.util.StrPool; import com.ningdatech.pmapi.ding.constants.DingOrganizationContant; import com.ningdatech.pmapi.organization.model.entity.DingOrganization; @@ -43,7 +44,9 @@ public class ProcDefManage { */ public String init() { List orgs = organizationService.list(Wrappers.lambdaQuery(DingOrganization.class) - .eq(DingOrganization::getTypeCode, DingOrganizationContant.UNIT_TYPE)); + .in(DingOrganization::getTypeCode, Lists.newArrayList( + DingOrganizationContant.UNIT_TYPE,DingOrganizationContant.GOV_TEMPORARY + ))); log.info("需要处理初始化单位配置的企业 数量为{}",orgs.size()); @@ -104,7 +107,9 @@ public class ProcDefManage { public String initByArea(String areaCode) { List orgs = organizationService.list(Wrappers.lambdaQuery(DingOrganization.class) - .eq(DingOrganization::getTypeCode, DingOrganizationContant.UNIT_TYPE) + .in(DingOrganization::getTypeCode, Lists.newArrayList( + DingOrganizationContant.UNIT_TYPE,DingOrganizationContant.GOV_TEMPORARY + )) .eq(DingOrganization::getDivisionCode,areaCode)); log.info("{}地区 需要处理初始化单位配置的企业 数量为{}",areaCode,orgs.size());