Merge branch '0630zhifk'

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ArchiveTreeContractMapper.java

@@ -108,4 +108,6 @@ public interface ArchiveTreeContractMapper extends BaseMapper<ArchiveTreeContrac
                                               @feign.Param("fileNumberPrefix") String fileNumberPrefix);
 
     ArchiveTreeContract getArchiveTreeContractByContractId(@Param("contractId") Long contractId);
+
+    int updateByNodeName(@Param("contractName") String contractName,@Param("name") String name);
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ArchiveTreeContractMapper.xml

@@ -501,5 +501,10 @@
             and (archive_auto_type != 2 and archive_auto_type != 3 or archive_auto_type is null)
         </if>
     </update>
+    <update id="updateByNodeName">
+        update m_archive_tree_contract
+        set node_name = #{name}
+        where node_name = #{contractName}
+    </update>
 
 </mapper>

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ContractInfoServiceImpl.java

@@ -22,10 +22,7 @@ import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.manager.dto.FindAllUserByConditionDTO;
 import org.springblade.manager.dto.SaveUserInfoByProjectDTO;
 import org.springblade.manager.entity.*;
-import org.springblade.manager.mapper.ContractInfoMapper;
-import org.springblade.manager.mapper.ProjectContractAreaMapper;
-import org.springblade.manager.mapper.SaveUserInfoByProjectMapper;
-import org.springblade.manager.mapper.WbsTreeContractMapper;
+import org.springblade.manager.mapper.*;
 import org.springblade.manager.service.IContractInfoService;
 import org.springblade.manager.vo.*;
 import org.springblade.system.user.entity.User;
@@ -53,6 +50,7 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
     private final JdbcTemplate jdbcTemplate;
     private final IUserClient iUserClient;
     private final InformationQueryClient informationQueryClient;
+    private final ArchiveTreeContractMapper archiveTreeContractMapper;
 
     @Override
     public List<String> getProcessContractByJLContractId(String contractId) {
@@ -671,7 +669,12 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
             if (contractInfos.size() > 0) {
                 throw new ServiceException("合同段名称已存在当前项目下,请重新输入");
             }
-
+            ContractInfo contractInfo1 = baseMapper.selectById(contractInfo.getId());
+            try {
+                int integer = archiveTreeContractMapper.updateByNodeName(contractInfo1.getContractName(),contractInfo.getContractName());
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
             boolean row = this.saveOrUpdate(contractInfo);
 
             //监理、总监办编辑