kimi42345
2020-03-11 2c43f24c1a778b48ac20b07e17f5da38136cafb4
src/main/java/com/highdatas/mdm/controller/MaintainController.java
@@ -104,10 +104,9 @@
            return Result.error(CodeMsg.SELECT_ERROR_NOTFOUND);
        }
        List<String> result = maintainList.stream()
        List<Maintain> result = maintainList.stream()
                .filter(maintain -> !StringUtils.isEmpty(maintain.getFlowId()))
                .filter(maintain -> flowsService.selectById(maintain.getFlowId()).getStatus().equals(ActivitiStatus.open))
                .map(maintain -> maintain.getVersion())
                .collect(Collectors.toList());
        return Result.success(result);
@@ -142,7 +141,7 @@
            result = maintainService.selectPage(maintainPage);
        } else {
            Wrapper<Maintain> tableNameWrapper = new EntityWrapper<Maintain>().eq("table_name", tableName);
            tableNameWrapper.orderBy("order_by desc");
            tableNameWrapper.orderBy("order_no desc");
            result = maintainService.selectPage(maintainPage, tableNameWrapper);
        }
        List<Maintain> records = result.getRecords();