From 6a4e8938736102a5b82767f8bf696f5ec5de1c26 Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Fri, 20 Mar 2026 11:00:08 +0800 Subject: [PATCH] feat(closedArea): add currentUserCanAudit logic for car apply --- .../query/ClosedAreaCarApplyQueryExe.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/ClosedAreaCarApplyQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/ClosedAreaCarApplyQueryExe.java index 32a0307..6af1648 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/ClosedAreaCarApplyQueryExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/ClosedAreaCarApplyQueryExe.java @@ -1,5 +1,6 @@ package com.zcloud.primeport.command.query; +import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.primeport.command.convertor.ClosedAreaCarApplyCoConvertor; import com.zcloud.primeport.dto.ClosedAreaCarApplyPageQry; import com.zcloud.primeport.dto.clientobject.ClosedAreaCarApplyCO; @@ -46,6 +47,22 @@ public class ClosedAreaCarApplyQueryExe { Map params = PageQueryHelper.toHashMap(closedAreaCarApplyPageQry); PageResponse pageResponse = closedAreaCarApplyRepository.listPage(params); List examCenterCOS = closedAreaCarApplyCoConvertor.converDOsToCOs(pageResponse.getData()); + + // 获取当前登录用户ID + Long currentUserId = AuthContext.getUserId(); + + // 设置当前用户是否能审核 + for (ClosedAreaCarApplyCO co : examCenterCOS) { + // 审核中(1)且当前用户是审批人 → 能审核(1),否则不能审核(2) + if (co.getAuditFlag() != null && co.getAuditFlag() == 1 + && co.getAuditPersonUserId() != null + && co.getAuditPersonUserId().equals(currentUserId)) { + co.setCurrentUserCanAudit(1); + } else { + co.setCurrentUserCanAudit(2); + } + } + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } }