From e724eadebb61bbecc5adea073f0ed13e2d19ced9 Mon Sep 17 00:00:00 2001
From: dearLin <1261008090@qq.com>
Date: Fri, 20 Mar 2026 09:22:59 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=B0=81=E9=97=AD=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=E4=BA=BA=E5=91=98=E7=94=B3=E8=AF=B7=E3=80=81=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E3=80=81=E6=8E=88=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/close/ClosedAreaController.java          | 16 +++++++++++-----
 .../close/ClosedAreaPersonApplyController.java   |  2 +-
 .../clientobject/ClosedAreaPersonApplyCO.java    |  5 +++++
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedAreaController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedAreaController.java
index d0812aa..e1edf50 100644
--- a/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedAreaController.java
+++ b/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedAreaController.java
@@ -19,11 +19,13 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
+
 /**
-* web-adapter
-* @Author dearLin
-* @Date 2026-03-19 10:27:50
-*/
+ * web-adapter
+ *
+ * @Author dearLin
+ * @Date 2026-03-19 10:27:50
+ */
 @Api(tags = "封闭区域")
 @RequestMapping("/${application.gateway}/closedArea")
 @RestController
@@ -49,9 +51,13 @@ public class ClosedAreaController {
     public PageResponse<ClosedAreaCO> page(@RequestBody ClosedAreaPageQry qry) {
         return closedAreaService.listPage(qry);
     }
+
     @ApiOperation("跟据管辖单位查询封闭区域")
     @GetMapping("/listAllByJurisdictionalCorpId/{id}")
     public MultiResponse<ClosedAreaCO> listAllByJurisdictionalCorpId(@PathVariable("id") Long id) {
+        if (id == null) {
+            id = AuthContext.getTenantId();
+        }
         return closedAreaService.listAllByJurisdictionalCorpId(id);
     }
 
@@ -70,7 +76,7 @@ public class ClosedAreaController {
 
     @ApiOperation("删除多个")
     @DeleteMapping("/ids")
-        public Response removeBatch(@RequestParam Long[] ids) {
+    public Response removeBatch(@RequestParam Long[] ids) {
         closedAreaService.removeBatch(ids);
         return SingleResponse.buildSuccess();
     }
diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedAreaPersonApplyController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedAreaPersonApplyController.java
index f3ca8ad..d973897 100644
--- a/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedAreaPersonApplyController.java
+++ b/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedAreaPersonApplyController.java
@@ -39,7 +39,7 @@ public class ClosedAreaPersonApplyController {
         return Response.buildSuccess();
     }
 
-    @ApiOperation("审批人员申请")
+    @ApiOperation("审批人员审批")
     @PostMapping("/auditPersonApply")
     public Response auditPersonApply(@RequestBody ClosedAreaPersonApplyAuditCmd auditCmd) {
         if (!(auditCmd.getAuditFlag().equals(2) || auditCmd.getAuditFlag().equals(3))) {
diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/ClosedAreaPersonApplyCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/ClosedAreaPersonApplyCO.java
index 48e9c2c..27b1f57 100644
--- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/ClosedAreaPersonApplyCO.java
+++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/ClosedAreaPersonApplyCO.java
@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.sql.Date;
+import java.util.HashMap;
+import java.util.List;
 
 
 /**
@@ -121,5 +123,8 @@ public class ClosedAreaPersonApplyCO extends ClientObject {
 
     @ApiModelProperty(value = "当前用户是否能审核。1，能审核2不能审核", name = "currentUserCanAudit")
     private Integer currentUserCanAudit;
+
+    @ApiModelProperty(value = "人员进出记录", name = "personInOutRecord")
+    private List<HashMap> personInOutRecord;
 }