Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/IDProjectServiceImpl.java

@@ -273,8 +273,8 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject>
                     .eq(DProject::getProjectCode, projectCode));
         } else {
             CbProjectRecord projectRecord = projectRecordMapper.selectById(projectId);
-            //未做任何改动时
-            Assert.isFalse(projectCode.equals(projectRecord.getIpmProjectNo()), "新编码与旧编码相同");
+            ////未做任何改动时
+            //Assert.isFalse(projectCode.equals(projectRecord.getIpmProjectNo()), "新编码与旧编码相同");
             //修改项目信息or新增新阶段项目时
             if (projectCode.equals(projectRecord.getIpmProjectNo())
                     && projectRecord.getIsGetProjectDetail()) {
@@ -297,7 +297,7 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject>
     @Override
     public CbProjectInfoVo getCbProjectInfo(Long projectId) {
         CbProjectRecord projectRecord = projectRecordMapper.selectById(projectId);
-        if (projectRecord.getIsGetProjectDetail()) {
+        if (!projectRecord.getIsGetProjectDetail()) {
             return null;
         }
         return BeanUtil.toBean(baseMapper.selectOne(new LambdaQueryWrapper<DProject>()