diff --git a/dsSupport/MyModel/MetaData/MetadataService/MetadataService.go b/dsSupport/MyModel/MetaData/MetadataService/MetadataService.go index 74bca4a4..8fdb170a 100644 --- a/dsSupport/MyModel/MetaData/MetadataService/MetadataService.go +++ b/dsSupport/MyModel/MetaData/MetadataService/MetadataService.go @@ -85,7 +85,7 @@ func CreateMetadata(model models.TDataexMetadata) (bool, string, error) { if !DatasourceDAO.IsDatasourceExistsByCode(html.EscapeString(model.DatasourceId)) { return false, "数据源编码不存在", nil } - if !Jyt2012DAO.IsJyt2012ExistsById(model.DicId) { + if model.DicId != "" && !Jyt2012DAO.IsJyt2012ExistsById(model.DicId) { return false, "该字典不存在", nil } business := new(models.TDataexMetadata) @@ -103,8 +103,17 @@ func CreateMetadata(model models.TDataexMetadata) (bool, string, error) { business.CheckPattern = model.CheckPattern business.CheckExist = model.CheckExist business.CreateTime = time.Now() - business.DeleteFlag = -1 - business.EnableFlag = 1 + if model.DeleteFlag == 0 { + business.DeleteFlag = -1 + } else { + business.DeleteFlag = model.DeleteFlag + } + if model.EnableFlag == 0 { + business.EnableFlag = 1 + } else { + business.EnableFlag = model.EnableFlag + } + result, message, error := MetadataDAO.CreateMetadata(business) return result, message, error @@ -115,7 +124,7 @@ func UpdateMetadata(id string, model models.TDataexMetadata) (bool, string, erro if !DatasourceDAO.IsDatasourceExistsByCode(html.EscapeString(model.DatasourceId)) { return false, "数据源编码不存在", nil } - if !Jyt2012DAO.IsJyt2012ExistsById(model.DicId) { + if model.DicId != "" && !Jyt2012DAO.IsJyt2012ExistsById(model.DicId) { return false, "该字典不存在", nil } business := new(models.TDataexMetadata) @@ -138,6 +147,12 @@ func UpdateMetadata(id string, model models.TDataexMetadata) (bool, string, erro business.CheckType = model.CheckType business.CheckPattern = model.CheckPattern business.CheckExist = model.CheckExist + if model.DeleteFlag != 0 { + business.DeleteFlag = model.DeleteFlag + } + if model.EnableFlag != 0 { + business.EnableFlag = model.EnableFlag + } result, message, error := MetadataDAO.UpdateMetadata(id, business)