引用编号问题

blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java

@@ -91,6 +91,7 @@ import java.net.URLEncoder;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -3780,6 +3781,14 @@ public R<Boolean> updateContractNodeParameter(@RequestParam Long pKeyId, @Reques
 
     //更新redis
     this.informationQueryService.delAsyncWbsTree(queries.getContractId());
+    //判断是否更改了划分编号
+    if(!StringUtils.equals(partitionCode,nodee.getPartitionCode())){
+        // 获取当前时间并格式化
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String currentTime = sdf.format(new Date());
+        String insert="insert into update_partition_log (id,node_id,old_partition_code,new_partition_code,update_user_id,update_user_name,update_time) values(?,?,?,?,?,?,?)";
+        jdbcTemplate.update(insert, SnowFlakeUtil.getId(), pKeyId,nodee.getPartitionCode()==null?"":nodee.getPartitionCode(),partitionCode==null?"":partitionCode,AuthUtil.getUserId(),AuthUtil.getNickName(),currentTime);
+    }
 
     return R.data(aBoolean);
 }

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

@@ -2207,11 +2207,11 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                         if(!list.isEmpty()){
                             // 获取第一个节点类型为5的元素
                             WbsTreeContract result = list.stream().filter(item -> item.getNodeType() == 5).findFirst().orElse(null);
-                            if(result!=null){
+                            if(result!=null&&StringUtils.isNotEmpty(result.getPartitionCode())){
                                 nodePartitionCode=result.getPartitionCode();
                             }else {
                                 WbsTreeContract result2 = list.stream().filter(item -> item.getNodeType() == 4).findFirst().orElse(null);
-                                if(result2!=null){
+                                if(result2!=null&&StringUtils.isNotEmpty(result2.getPartitionCode())){
                                     nodePartitionCode=result2.getPartitionCode();
                                 }
                             }
@@ -2221,7 +2221,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                 for (Element element : bhtitle) {
                     int trindex = Integer.parseInt(element.attr("trindex"));
                     if (trindex <= 10) {
-                        if (StringUtils.isNotBlank(nodePartitionCode)) {
+                        if (StringUtils.isNotEmpty(nodePartitionCode)) {
                             bhData.put(element.attr("keyName"), nodePartitionCode);
                         }
                     }