From 11c49d669c86803907fa3a7a4e0df1392c376456 Mon Sep 17 00:00:00 2001
From: dearLin <1261008090@qq.com>
Date: Tue, 31 Mar 2026 16:32:02 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=8F=A3=E9=97=A8=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5=E5=BE=85=E5=8A=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../primeport/command/query/MkmjApprovalUserQueryExe.java | 8 ++++++--
 .../com/zcloud/primeport/command/query/MkmjQueryExe.java  | 1 +
 .../com/zcloud/primeport/dto/MkmjApprovalUserPageQry.java | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjApprovalUserQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjApprovalUserQueryExe.java
index 14d7459..6fed8c0 100644
--- a/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjApprovalUserQueryExe.java
+++ b/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjApprovalUserQueryExe.java
@@ -43,8 +43,12 @@ public class MkmjApprovalUserQueryExe {
 
     public List<MkmjApprovalUserCO> listAll(MkmjApprovalUserPageQry qry) {
         QueryWrapper<MkmjApprovalUserDO> mkmjApprovalUserCOQueryWrapper = new QueryWrapper<>();
-//        mkmjApprovalUserCOQueryWrapper.eq("corp_id", qry.getCorpId());
-//        mkmjApprovalUserCOQueryWrapper.eq("dept_id", qry.getDeptId());
+        if (qry.getCorpId() != null) {
+            mkmjApprovalUserCOQueryWrapper.eq("corp_id", qry.getCorpId());
+        }
+        if (qry.getDeptId() != null) {
+            mkmjApprovalUserCOQueryWrapper.eq("dept_id", qry.getDeptId());
+        }
         if (qry.getPersonnelPermissionFlag() != null) {
             mkmjApprovalUserCOQueryWrapper.eq("personnel_permission_flag", qry.getPersonnelPermissionFlag());
         }
diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjQueryExe.java
index 05b6e65..409577b 100644
--- a/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjQueryExe.java
+++ b/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjQueryExe.java
@@ -47,6 +47,7 @@ public class MkmjQueryExe {
 
     public List<MkmjCO> listAll(MkmjPageQry qry) {
         QueryWrapper<MkmjDO> mkmjDOQueryWrapper = new QueryWrapper<>();
+        mkmjDOQueryWrapper.eq("mkmj_status","2");
         if (Tools.notEmpty(qry.getHgAuthArea())) {
             mkmjDOQueryWrapper.eq("hg_auth_area", qry.getHgAuthArea());
         }
diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserPageQry.java
index d899da0..b8d4a93 100644
--- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserPageQry.java
+++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserPageQry.java
@@ -24,9 +24,9 @@ public class MkmjApprovalUserPageQry extends PageQuery {
      * - `le`: 小于等于比较查询
      * - `ne`: 不等比较查询，对应SQL的!=操作符
      */
-    @ApiModelProperty(value = "审批人企业id必传", name = "corpId", required = true)
+    @ApiModelProperty(value = "审批人企业id", name = "corpId", required = true)
     private Long corpId;
-    @ApiModelProperty(value = "审批人部门id必传", name = "deptId")
+    @ApiModelProperty(value = "审批人部门id", name = "deptId")
     private Long deptId;
     @ApiModelProperty(value = "审批人姓名", name = "userName")
     private String userName;