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}, '%')