Merge remote-tracking branch 'origin/master'

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -2754,6 +2754,9 @@ public class ExcelTabController extends BladeController {
     })
     public R<List<Map<String, Object>>> getTheLogBusinessData(String theLogId, String nodePrimaryKeyId, String recordTime, String contractId) {
         List<Map<String, Object>> resultMapList = new ArrayList<>();
+        //数据结果
+        Map<String, Object> reData = new HashMap<>();
+
         //获取对应的记录
         String dataIds;
         if (StringUtils.isNotEmpty(theLogId)) {
@@ -2766,6 +2769,11 @@ public class ExcelTabController extends BladeController {
             dataIds = ids.stream().filter(Objects::nonNull).collect(Collectors.joining(","));
         } else {
             List<ContractLog> contractLogs = this.contractLogClient.queryContractLogByPrimaryKeyIdAndRecordTimeList(nodePrimaryKeyId, recordTime, contractId);
+            if (contractLogs.size() == 0){
+                reData.put("logId","");
+            }else {
+                reData.put("logId",contractLogs.get(0).getId());
+            }
             dataIds = contractLogs.stream().map(ContractLog::getDataId).filter(Objects::nonNull).map(String::valueOf).collect(Collectors.joining(","));
         }
 
@@ -2773,6 +2781,7 @@ public class ExcelTabController extends BladeController {
         WbsTreePrivate tableNode2 = this.wbsTreePrivateService.getOne(Wrappers.<WbsTreePrivate>lambdaQuery()
                 .eq(WbsTreePrivate::getParentId, node.getId()).eq(WbsTreePrivate::getProjectId, node.getProjectId()));
 
+
         if (StringUtils.isNotEmpty(dataIds)) {
             for (String dataId : dataIds.split(",")) {
                 //检查实体表是否存在
@@ -2787,8 +2796,7 @@ public class ExcelTabController extends BladeController {
                 String querySql = "SELECT * FROM " + tabName + " WHERE id = " + dataId + " and group_id = " + tableNode2.getPKeyId();
                 List<Map<String, Object>> businessDataMap = this.jdbcTemplate.queryForList(querySql);
 
-                //数据结果
-                Map<String, Object> reData = new HashMap<>();
+
 
                 if (businessDataMap.size() > 0) {
                     // 匹配关联