init

repositories/model/object_attr_repo.go

@@ -19,26 +19,26 @@ func NewObjectAttrRepo(engine *xorm.Engine) *ObjectAttrRepo {
 }
 
 func (d *ObjectAttrRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
-	keywords := m["keywords"].(string)
-	limit := m["limit"].(int)
-	page := m["page"].(int)
+	keywords  := m["keywords"].(string)
+	limit     := m["limit"].(int)
+	page      := m["page"].(int)
 
 	sqlSelect := `SELECT A.*`
-	sqlFrom := `FROM   ds_object_attr   AS A `
-	sqlWhere := `WHERE A.deleted_flag = 0 `
+	sqlFrom   := `FROM   ds_object_attr   AS A `
+	sqlWhere  := `WHERE A.deleted_flag = 0 `
 	if keywords != "" {
 		sqlWhere += ` AND A.attr_title like ` + "'%" + keywords + "%'"
 	}
 
-	sqlCount := `SELECT COUNT(*) `
+	sqlCount  := `SELECT COUNT(*) `
 	total, err1 := d.engine.SQL(sqlCount + sqlFrom + sqlWhere).Count(new(datamodels.ObjectAttr))
 	if err1 != nil {
 		return nil, err1
 	}
 
 	sqlOrderBy := " ORDER BY object_id DESC "
-	pageStart := (page - 1) * limit
-	sqlLimit := fmt.Sprintf(" LIMIT %d OFFSET %d ", limit, pageStart)
+	pageStart  := (page - 1) * limit
+	sqlLimit   := fmt.Sprintf(" LIMIT %d OFFSET %d ", limit, pageStart)
 
 	datalist := make([]datamodels.ObjectAttr, 0)
 	err2 := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy + sqlLimit).Find(&datalist)
@@ -55,26 +55,26 @@ func (d *ObjectAttrRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResu
 }
 
 func (d *ObjectAttrRepo) GetList(m map[string]interface{}) ([]viewmodels.ObjectAttrInfo, error) {
-	keywords := m["keywords"].(string)
-
-	sqlSelect := `SELECT A.* `
-	sqlFrom := `FROM  ds_object_attr   AS A    `
-	sqlWhere := `WHERE A.deleted_flag = 0 `
+	keywords   := m["keywords"].(string)
+	sqlSelect  := ` SELECT A.* `
+	sqlFrom    := ` FROM  ds_object_attr   AS A    `
+	sqlWhere   := ` WHERE A.deleted_flag = 0 `
 	if keywords != "" {
 		sqlWhere += ` AND   A.attr_title like ` + "'%" + keywords + "%'"
 	}
-
 	sqlOrderBy := " ORDER BY model_id DESC "
-	datalist := make([]viewmodels.ObjectAttrInfo, 0)
+	
+	datalist   := make([]viewmodels.ObjectAttrInfo, 0)
 	err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy).Find(&datalist)
 	if err != nil {
 		return nil, err
+	} else {
+		return datalist, nil
 	}
-	return datalist, nil
 }
 
 func (d *ObjectAttrRepo) GetById(modelId, objectId, attrId int64) (*viewmodels.ObjectAttrInfo, error) {
-	data := &viewmodels.ObjectAttrInfo{}
+	data    := &viewmodels.ObjectAttrInfo{}
 	ok, err := d.engine.
 		Where("model_id = ?", modelId).
 		Where("object_id = ?", objectId).
@@ -94,10 +94,9 @@ func (d *ObjectAttrRepo) Create(data *datamodels.ObjectAttr) error {
 }
 
 func (d *ObjectAttrRepo) Update(data *datamodels.ObjectAttr) error {
-	modelId := data.ModelId
-	objectId := data.ObjectId
-	attrId := data.AttrId
-
+	modelId   := data.ModelId
+	objectId  := data.ObjectId
+	attrId    := data.AttrId
 	data.UpdatedAt = time.Now()
 	_, err := d.engine.
 		Where("model_id = ?", modelId).
@@ -108,9 +107,9 @@ func (d *ObjectAttrRepo) Update(data *datamodels.ObjectAttr) error {
 }
 
 func (d *ObjectAttrRepo) Delete(m map[string]interface{}) error {
-	modelId := m["modelId"].(int64)
-	objectId := m["objectId"].(int64)
-	attrId := m["attrId"].(int64)
+	modelId   := m["modelId"].(int64)
+	objectId  := m["objectId"].(int64)
+	attrId    := m["attrId"].(int64)
 	deletedBy := m["deletedBy"].(int64)
 
 	data := &datamodels.ObjectAttr{}

service/model/object_service.go

@@ -54,7 +54,7 @@ func (s *objectService) Update(Object *datamodels.Object) error {
 }
 
 func (s *objectService) Delete(m map[string]interface{}) error {
-	modelId := m["modelId"].(int64)
+	modelId  := m["modelId"].(int64)
 	objectId := m["objectId"].(int64)
 	err := s.objectRepo.Delete(m)
 	if err != nil {
@@ -100,8 +100,8 @@ func (s *objectService) GetObjectDataById(modelId, objectId int64) (*viewmodels.
 }
 
 func (s *objectService) CreateObjectData(o *viewmodels.ObjectDataInfo) error {
-	modelId := o.ModelId
-	objectId := NewID()
+	modelId   := o.ModelId
+	objectId  := NewID()
 	createdBy := o.CreatedBy
 	object := &datamodels.Object{
 		ModelId:     modelId,
@@ -149,8 +149,8 @@ func (s *objectService) CreateObjectData(o *viewmodels.ObjectDataInfo) error {
 }
 
 func (s *objectService) UpdateObjectData(o *viewmodels.ObjectDataInfo) error {
-	modelId := o.ModelId
-	objectId := o.ObjectId
+	modelId   := o.ModelId
+	objectId  := o.ObjectId
 	updatedBy := o.UpdatedBy
 	object := &datamodels.Object{
 		ModelId:     modelId,