Merge remote-tracking branch 'origin/master'

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java

@@ -11,6 +11,7 @@ import com.ningdatech.basic.function.VUtils;
 import com.ningdatech.basic.model.PageVo;
 import com.ningdatech.basic.util.CollUtils;
 import com.ningdatech.basic.util.NdDateUtils;
+import com.ningdatech.pmapi.common.constant.BizConst;
 import com.ningdatech.pmapi.common.constant.RegionConst;
 import com.ningdatech.pmapi.common.enumeration.CommonEnum;
 import com.ningdatech.pmapi.common.enumeration.ProjectProcessStageEnum;
@@ -136,7 +137,7 @@ public class DeclaredProjectManage {
         WflowModels model = processModelService.getOne(Wrappers.lambdaQuery(WflowModels.class)
                 .eq(WflowModels::getRegionCode, regionCode)
                 .eq(WflowModels::getProcessType, ProjectProcessStageEnum.ORG_INTERNAL_APPROVAL_PROCESS.getCode())
-                .last("limit 1"));
+                .last(BizConst.LIMIT_1));
 
         if (Objects.isNull(model)) {
             log.error("此 【{}】区域找不到单位流程配置", regionCode);

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ProjectAdjustmentManage.java

@@ -98,9 +98,9 @@ public class ProjectAdjustmentManage {
         }
 
         //修改项目内容
-        if(!modifyProject(projectDto)){
-            throw new BusinessException("调整项目失败!");
-        }
+//        if(!modifyProject(projectDto)){
+//            throw new BusinessException("调整项目失败!");
+//        }
 
         //最后去重新 提交项目流程 不同的状态 提交到不同的工作流去
         Function<DefaultDeclaredDTO, String> declaredFunction =