From 13d61f2577533e64283e66cd3050b80b5832a15b Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Fri, 28 Jul 2023 11:53:35 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=20debug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pmapi/ding/controller/DingInfoPullController.java | 3 +++ .../ningdatech/pmapi/projectlib/manage/ProjectLibManage.java | 12 ++---------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/ding/controller/DingInfoPullController.java b/pmapi/src/main/java/com/ningdatech/pmapi/ding/controller/DingInfoPullController.java index 6fa68c9..ba7fd3c 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/ding/controller/DingInfoPullController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/ding/controller/DingInfoPullController.java @@ -2,6 +2,7 @@ package com.ningdatech.pmapi.ding.controller; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.SecureUtil; +import cn.hutool.crypto.digest.HMac; import cn.hutool.crypto.digest.MD5; import com.google.common.collect.Maps; import com.ningdatech.irs.service.IRefreshTokenService; @@ -11,6 +12,8 @@ import com.ningdatech.pmapi.ding.task.EmployeeBatchGetTask; import com.ningdatech.pmapi.ding.task.GovBusinessStripsTask; import com.ningdatech.pmapi.ding.task.OrganizationBatchGetTask; import com.ningdatech.pmapi.organization.manage.ProcDefManage; +import com.sun.crypto.provider.HmacMD5; +import com.sun.crypto.provider.HmacMD5KeyGenerator; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java index 9e5edfa..cbb8f78 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java @@ -499,17 +499,10 @@ public class ProjectLibManage { .ne(Project::getId, project.getId()) .eq(Project::getProjectCode, project.getProjectCode())); - //采取批量删除 批量添加的方式 批量删除建设方案申报后的应用信息及关联的核心业务 - List projectCodeList = projectService.list(Wrappers.lambdaQuery(Project.class) - .eq(Project::getProjectCode, project.getProjectCode()) - .eq(Project::getIsConstruct, isConstruct)).stream() - .map(Project::getProjectCode).collect(Collectors.toList()); - + //删除当前版本的app 一般情况是没有 保险起见 List applications = projectApplicationService.list(Wrappers.lambdaQuery(ProjectApplication.class) .eq(ProjectApplication::getProjectCode, project.getProjectCode()) - .in(CollUtil.isNotEmpty(projectCodeList), ProjectApplication::getProjectCode, projectCodeList) - .eq(ProjectApplication::getProjectVersion, project.getVersion()) - .eq(ProjectApplication::getIsConstruct, Boolean.TRUE)); + .eq(ProjectApplication::getProjectVersion, project.getVersion())); if (CollUtil.isNotEmpty(applications)) { projectApplicationService.removeBatchByIds(applications); List applicationIds = applications.stream().map(ProjectApplication::getId).collect(Collectors.toList()); @@ -517,7 +510,6 @@ public class ProjectLibManage { .in(ProjectCoreBusinessIndicators::getApplicationId, applicationIds)); } - //app List applicationList = projecDto.getApplicationList(); if (CollUtil.isNotEmpty(applicationList)) {