bak 修改 获取版本数据前

kimi

2020-05-18 c8aee7b9bfd79cfd741d7e5692520f4f51a31a86

 src/main/java/com/highdatas/mdm/service/impl/SysFieldServiceImpl.java

@@ -142,12 +142,12 @@
            Map<String, String> maintainFieldMap = maintainFieldMapper.getMappedMatintainId(DbUtils.quotedStr(maintain.getTableName()), maintain.getOrderNo());

            if (maintainFieldMap == null) {
                return new MaintainField().setId(Constant.Default);
                return new MaintainField().setId(Constant.Default).setTableName(maintain.getTableName());
            }
            String maintainFieldId = maintainFieldMap.get(Constant.ID);
            maintainField = maintainFieldService.selectById(maintainFieldId);
            if (maintainField == null){
                return new MaintainField().setId(Constant.Default);
                return new MaintainField().setId(Constant.Default).setTableName(maintain.getTableName());
            }
        }

@@ -162,7 +162,7 @@
        // 当前版本正在审批  找前一版本
        Integer maintainFieldOrderNo = maintainField.getOrderNo();
        if (maintainFieldOrderNo < 1) {
            return new MaintainField().setId(Constant.Default);
            return new MaintainField().setId(Constant.Default).setTableName(maintain.getTableName());
        }else {
            Integer preNo = maintainFieldOrderNo - 1;
            maintainField = maintainFieldService.selectOne(new EntityWrapper<MaintainField>().eq("table_name", maintain.getTableName()).eq("order_no", preNo));
@@ -206,7 +206,7 @@
            List<SysField> maxFieldList = getFieldByMaintainField(maxVersion.getId());
            List<SysField> createdFieldList = getFieldByTable(tableName);
            result.fluentPut("list", packageFieldList(createdFieldList, maxFieldList));
            result.fluentPut("aduit", false);
            result.fluentPut("aduit", true);
            result.fluentPut("flowStatus", null);
            result.fluentPut("maintainFieldId", maxVersion.getId());
            String flowId = maxVersion.getFlowId();
@@ -371,6 +371,20 @@
    }

    @Override
    public SysField getOneFieldByMaintain(String maintainId, String field) {
        List<SysField> fieldByMaintain = getFieldByMaintain(maintainId);
        if (fieldByMaintain == null || fieldByMaintain.isEmpty()) {
            return null;
        }
        for (SysField sysField : fieldByMaintain) {
            if (sysField.getField().equalsIgnoreCase(field)) {
                return sysField;
            }
        }
        return null;
    }

    @Override
    public List<SysField> getFieldByMaintainField(String maintainId) {
        if (StringUtils.isEmpty(maintainId)) {
            return null;