|
|
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON; |
|
|
|
import com.alibaba.fastjson.TypeReference; |
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
|
|
import com.ningdatech.basic.function.VUtils; |
|
|
|
import com.ningdatech.pmapi.common.constant.RegionConst; |
|
|
|
import com.ningdatech.pmapi.common.helper.UserInfoHelper; |
|
|
|
import com.ningdatech.pmapi.organization.model.entity.DingOrganization; |
|
|
|
import com.ningdatech.pmapi.organization.service.IDingOrganizationService; |
|
|
@@ -164,6 +165,21 @@ public class DefaultDeclaredProjectManage { |
|
|
|
orgInfoDTO.setOrgModelMap(orgModelsList.stream() |
|
|
|
.collect(Collectors.toMap(WflowOrgModels::getProcessDefId, v -> v))); |
|
|
|
orgMap.put(OrgTypeEnum.TARGET_LABEL.name(),orgInfoDTO); |
|
|
|
|
|
|
|
//如果有上级条线主管单位 并且 不是市本级 |
|
|
|
if(!RegionConst.RC_LS.equals(userFullInfo.getRegionCode())){ |
|
|
|
OrgInfoDTO parentLineOrgInfoDto = new OrgInfoDTO(); |
|
|
|
parentLineOrgInfoDto.setOrganizationCode(project.getHigherSuperOrgCode()); |
|
|
|
parentLineOrgInfoDto.setOrganizationName(project.getHigherSuperOrg()); |
|
|
|
parentLineOrgInfoDto.setOrgModelMap(orgModelsList.stream() |
|
|
|
.filter(v -> v.getOrgCode().equals(project.getHigherSuperOrgCode()) |
|
|
|
&& Boolean.FALSE.equals(v.getIsDelete()) |
|
|
|
&& (ProcessDefTypeEnum.SEAL.name().equals(v.getType()) || |
|
|
|
ProcessDefTypeEnum.DEFAULT.name().equals(v.getType()))) |
|
|
|
.collect(Collectors.toMap(WflowOrgModels::getType, v -> v))); |
|
|
|
|
|
|
|
orgMap.put(OrgTypeEnum.TARGET_LINE_MANAGEMENT.name(),parentLineOrgInfoDto); |
|
|
|
} |
|
|
|
return orgMap; |
|
|
|
} |
|
|
|
|
|
|
|