huangjn il y a 2 ans
Parent
commit
294f6750dc

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

@@ -1722,7 +1722,11 @@ public class ExcelTabController extends BladeController {
     @GetMapping("/get-the-log-pdfInfo")
     @ApiOperationSupport(order = 25)
     @ApiOperation(value = "日志预览")
-    @ApiImplicitParam(name = "theLogId", value = "日志ID", required = true)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "theLogId", value = "日志记录的id,可能为空"),
+            @ApiImplicitParam(name = "nodePrimaryKeyId", value = "当前操作的日志类型ID,即左侧列表的节点primaryKeyId"),
+            @ApiImplicitParam(name = "recordTime", value = "当前选择的填写日期,即右侧日期控件所选日期,格式为 yyyy-MM-dd")
+    })
     public R<String> getTheLogPdInfo(String theLogId, String nodePrimaryKeyId, String recordTime) throws Exception{
         //获取配置的路径
         String file_path = ParamCache.getValue(CommonConstant.SYS_LOCAL_URL);
@@ -1732,6 +1736,9 @@ public class ExcelTabController extends BladeController {
         if(StringUtils.isNotEmpty(theLogId)){
             theLogJson = this.contractLogClient.queryContractLogById(theLogId);
         } else {
+            if(StringUtils.isEmpty(recordTime)){
+                recordTime = DateUtil.format(DateUtil.now(), "yyyy-MM-dd");
+            }
             theLogJson = this.contractLogClient.queryContractLogByPrimaryKeyIdAndRecordTime(nodePrimaryKeyId, recordTime);
         }
 

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

@@ -306,6 +306,9 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
 				businessId = SnowFlakeUtil.getId().toString();
 			} else {
 				businessId = logJson.getString("dataId");
+				if(StringUtils.isEmpty(businessId)){
+					businessId = SnowFlakeUtil.getId().toString();
+				}
 			}
 		}
 		List<JSONObject> linkTabIds = JSONArray.parseArray(JSONObject.toJSONString(tableInfoList.get(0).getLinkTabIds()), JSONObject.class);