Merge remote-tracking branch 'origin/master'

fuliqi

2024-07-18 ba614fbd8836f9bcce04ab4177b06329bed0b651

Merge remote-tracking branch 'origin/master'

 ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderBatchAuditingForm.java

@@ -30,7 +30,7 @@
    /**
     * 故障类型
     */
    @NotBlank(message = "故障类型不能为空")
    private String errorType;
    @NotEmpty(message = "故障类型不能为空")
    private List<String> errorTypes;

}

 ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java

@@ -132,7 +132,7 @@
        // 根据故障类型获取列表
        List<WorkOrder> list = new LambdaQueryChainWrapper<>(baseMapper)
                .in(WorkOrder::getStatus, WorkOrderStatusEnum.YW_HANDLE.getValue())
                .eq(WorkOrder::getErrorType, form.getErrorType())
                .in(WorkOrder::getErrorType, form.getErrorTypes())
                .select(WorkOrder::getId, WorkOrder::getUnitId, WorkOrder::getWorkOrderNo)
                .list();
        if (list.isEmpty()) {