Merge remote-tracking branch 'origin/dev' into dev

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/app/taskorderitemreport/BoilerAppTaskOrderItemReportController.java

@@ -1,5 +1,6 @@
 package cn.start.tz.module.pressure2.controller.app.taskorderitemreport;
 
+import cn.hutool.core.util.StrUtil;
 import cn.start.tz.framework.common.pojo.CommonResult;
 import cn.start.tz.framework.common.pojo.PageResult;
 import cn.start.tz.module.pressure2.framework.appauth.core.annotation.AppAuth;
@@ -40,6 +41,9 @@ public class BoilerAppTaskOrderItemReportController {
     @Operation(summary = "获得报告档案分页")
     @PermitAll
     public CommonResult<PageResult<BoilerTaskOrderRespVO>> getArchivePage(@Valid BoilerTaskOrderPageReqVO pageReqVO) {
+        if (StrUtil.isBlank(pageReqVO.getUnitCode())) {
+            return success(PageResult.empty());
+        }
         return success(boilerTaskOrderIssueReportService.archivePage(pageReqVO));
     }
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/app/taskorderitemreport/PipeAppTaskOrderItemReportController.java

@@ -1,5 +1,6 @@
 package cn.start.tz.module.pressure2.controller.app.taskorderitemreport;
 
+import cn.hutool.core.util.StrUtil;
 import cn.start.tz.framework.common.pojo.CommonResult;
 import cn.start.tz.framework.common.pojo.PageResult;
 import cn.start.tz.module.pressure2.framework.appauth.core.annotation.AppAuth;
@@ -41,6 +42,9 @@ public class PipeAppTaskOrderItemReportController {
     @Operation(summary = "获得报告档案分页")
     @PermitAll
     public CommonResult<PageResult<PipeTaskOrderRespVO>> getArchivePage(@Valid PipeTaskOrderPageReqVO pageReqVO) {
+        if (StrUtil.isBlank(pageReqVO.getUnitCode())) {
+            return success(PageResult.empty());
+        }
         return success(pipeTaskOrderIssueReportService.archivePage(pageReqVO));
     }