采购 debug

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;

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<String> 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<ProjectApplication> 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<Long> applicationIds = applications.stream().map(ProjectApplication::getId).collect(Collectors.toList());
@@ -517,7 +510,6 @@ public class ProjectLibManage {
                         .in(ProjectCoreBusinessIndicators::getApplicationId, applicationIds));
             }
 
-
             //app
             List<ProjectApplicationDTO> applicationList = projecDto.getApplicationList();
             if (CollUtil.isNotEmpty(applicationList)) {