From b697d8990d3d201ddb1957d293854f38fb497391 Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Wed, 27 May 2026 08:45:03 +0800 Subject: [PATCH] =?UTF-8?q?fixed=EF=BC=9A=2017182=20=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=A9=B3=E5=9B=9E=E7=8A=B6=E6=80=81=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=20=E6=89=80=E6=9C=89=E7=94=B3=E8=AF=B7=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E9=83=BD=E9=9C=80=E8=A6=81=E6=9C=89=E9=A9=B3=E5=9B=9E?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=9A=84=E6=95=B0=E6=8D=AE=20=E7=9B=91?= =?UTF-8?q?=E7=AE=A1=E7=AB=AF=E5=92=8C=E4=BC=81=E4=B8=9A=E7=AB=AF=E9=83=BD?= =?UTF-8?q?=E6=9C=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/primeport/dto/MkmjApprovalUserAddCmd.java | 4 ++-- .../src/main/resources/mapper/VehicleApplyDO.xml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserAddCmd.java index f268e20..2584e2d 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserAddCmd.java @@ -34,11 +34,11 @@ public class MkmjApprovalUserAddCmd extends Command { @NotEmpty(message = "审批人部门名称不能为空") private String deptName; @ApiModelProperty(value = "审批人岗位Id") - @NotNull(message = "审批人岗位Id不能为空") +// @NotNull(message = "审批人岗位Id不能为空") private Long postId; //审批人岗位名称 @ApiModelProperty(value = "审批人岗位名称") - @NotEmpty(message = "审批人岗位名称不能为空") +// @NotEmpty(message = "审批人岗位名称不能为空") private String postName; @ApiModelProperty(value = "审批人id", name = "userId", required = true) @NotNull(message = "审批人id不能为空") diff --git a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml index e8578e0..7869077 100644 --- a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml +++ b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml @@ -48,7 +48,6 @@ LEFT JOIN vehicle_audit AS a ON f.id = a.vehicle_apply_id AND a.delete_enum = 'FALSE' AND a.audit_status = 1 WHERE f.delete_enum = 'FALSE' - AND f.audit_flag != 3 AND f.remarks like CONCAT('%', #{params.remarks}, '%')