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 listAll(MkmjApprovalUserPageQry qry) { QueryWrapper 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 listAll(MkmjPageQry qry) { QueryWrapper 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;