init

repositories/model/model_repo.go

@@ -18,7 +18,7 @@ func NewModelRepo(engine *xorm.Engine) *ModelRepo {
 	}
 }
 
-func (d *ModelRepo) GetByPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
+func (d *ModelRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
 	keywords  := m["keywords"].(string)
 	limit     := m["limit"].(int)
 	page      := m["page"].(int)
@@ -54,7 +54,7 @@ func (d *ModelRepo) GetByPage(m map[string]interface{}) (*viewmodels.PageResult,
 	return pageResult, nil
 }
 
-func (d *ModelRepo) GetByList(m map[string]interface{}) ([]viewmodels.ModelInfo, error) {
+func (d *ModelRepo) GetList(m map[string]interface{}) ([]viewmodels.ModelInfo, error) {
 	keywords := m["keywords"].(string)
 
 	sqlSelect := `SELECT A.* `

repositories/model/object_attr_repo.go

@@ -18,7 +18,7 @@ func NewObjectAttrRepo(engine *xorm.Engine) *ObjectAttrRepo {
 	}
 }
 
-func (d *ObjectAttrRepo) GetByPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
+func (d *ObjectAttrRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
 	keywords := m["keywords"].(string)
 	limit := m["limit"].(int)
 	page := m["page"].(int)
@@ -54,7 +54,7 @@ func (d *ObjectAttrRepo) GetByPage(m map[string]interface{}) (*viewmodels.PageRe
 	return pageResult, nil
 }
 
-func (d *ObjectAttrRepo) GetByList(m map[string]interface{}) ([]viewmodels.ObjectAttrInfo, error) {
+func (d *ObjectAttrRepo) GetList(m map[string]interface{}) ([]viewmodels.ObjectAttrInfo, error) {
 	keywords := m["keywords"].(string)
 
 	sqlSelect := `SELECT A.* `

repositories/model/object_repo.go

@@ -18,7 +18,7 @@ func NewObjectRepo(engine *xorm.Engine) *ObjectRepo {
 	}
 }
 
-func (d *ObjectRepo) GetByPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
+func (d *ObjectRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
 	keywords := m["keywords"].(string)
 	limit := m["limit"].(int)
 	page := m["page"].(int)
@@ -54,7 +54,7 @@ func (d *ObjectRepo) GetByPage(m map[string]interface{}) (*viewmodels.PageResult
 	return pageResult, nil
 }
 
-func (d *ObjectRepo) GetByList(m map[string]interface{}) ([]viewmodels.ObjectInfo, error) {
+func (d *ObjectRepo) GetList(m map[string]interface{}) ([]viewmodels.ObjectInfo, error) {
 	modelId := m["modelId"].(int64)
 	keywords := m["keywords"].(string)
 

repositories/system/account_repo.go

@@ -134,7 +134,7 @@ func (d *AccountRepo) GetById(ocId int64, accountId int64) *viewmodels.AccountIn
 
 }
 
-func (d *AccountRepo) GetByList(ocId int64) ([]viewmodels.AccountInfo, error) {
+func (d *AccountRepo) GetList(ocId int64) ([]viewmodels.AccountInfo, error) {
 	datalist := make([]viewmodels.AccountInfo, 0)
 
 	sqlSelect := ` SELECT   A.oc_id,

repositories/system/app_cat_repo.go

@@ -18,14 +18,14 @@ func NewAppCatRepo(engine *xorm.Engine) *AppCatRepo {
 	}
 }
 
-func (d *AppCatRepo) GetByPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
-	keywords := m["keywords"].(string)
-	limit := m["limit"].(int)
-	page := m["page"].(int)
-
-	sqlSelect := `SELECT A.*`
-	sqlFrom := `FROM   app_cat   AS A `
-	sqlWhere := `WHERE A.deleted_flag = 0 `
+func (d *AppCatRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
+	keywords  := m["keywords"].(string)
+	limit     := m["limit"].(int)
+	page      := m["page"].(int)
+
+	sqlSelect := `SELECT A.*                `
+	sqlFrom   := `FROM   app_cat   AS A     `
+	sqlWhere  := `WHERE  A.deleted_flag = 0 `
 	if keywords != "" {
 		sqlWhere += ` AND A.app_cat_title like ` + "'%" + keywords + "%'"
 	}
@@ -37,8 +37,8 @@ func (d *AppCatRepo) GetByPage(m map[string]interface{}) (*viewmodels.PageResult
 	}
 
 	sqlOrderBy := " ORDER BY app_cat_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.AppCat, 0)
 	err2 := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy + sqlLimit).Find(&datalist)
@@ -54,18 +54,17 @@ func (d *AppCatRepo) GetByPage(m map[string]interface{}) (*viewmodels.PageResult
 	return pageResult, nil
 }
 
-func (d *AppCatRepo) GetByList(m map[string]interface{}) ([]viewmodels.AppCatInfo, error) {
-	keywords := m["keywords"].(string)
-
-	sqlSelect := `SELECT A.* `
-	sqlFrom := `FROM  app_cat   AS A    `
-	sqlWhere := `WHERE A.deleted_flag = 0 `
+func (d *AppCatRepo) GetList(m map[string]interface{}) ([]viewmodels.AppCatInfo, error) {
+	keywords   := m["keywords"].(string)
+	sqlSelect  := `SELECT A.* `
+	sqlFrom    := `FROM  app_cat   AS A    `
+	sqlWhere   := `WHERE A.deleted_flag = 0 `
 	if keywords != "" {
 		sqlWhere += ` AND   A.app_cat_title like ` + "'%" + keywords + "%'"
 	}
 
 	sqlOrderBy := " ORDER BY app_cat_id DESC "
-	datalist := make([]viewmodels.AppCatInfo, 0)
+	datalist   := make([]viewmodels.AppCatInfo, 0)
 	err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy).Find(&datalist)
 	if err != nil {
 		return nil, err

repositories/system/app_repo.go

@@ -18,7 +18,7 @@ func NewAppRepo(engine *xorm.Engine) *AppRepo {
 	}
 }
 
-func (d *AppRepo) GetByPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
+func (d *AppRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
 	keywords  := m["keywords"].(string)
 	limit     := m["limit"].(int)
 	page      := m["page"].(int)
@@ -56,7 +56,7 @@ func (d *AppRepo) GetByPage(m map[string]interface{}) (*viewmodels.PageResult, e
 	return pageResult, nil
 }
 
-func (d *AppRepo) GetByList(m map[string]interface{}) ([]viewmodels.AppInfo, error) {
+func (d *AppRepo) GetList(m map[string]interface{}) ([]viewmodels.AppInfo, error) {
 	keywords := m["keywords"].(string)
 
 	sqlSelect := ` SELECT     A.* ,

repositories/system/ent_cat_repo.go

@@ -18,7 +18,7 @@ func NewEntCatRepo(engine *xorm.Engine) *EntCatRepo {
 	}
 }
 
-func (d *EntCatRepo) GetByPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
+func (d *EntCatRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
 	keywords := m["keywords"].(string)
 	limit := m["limit"].(int)
 	page := m["page"].(int)
@@ -54,7 +54,7 @@ func (d *EntCatRepo) GetByPage(m map[string]interface{}) (*viewmodels.PageResult
 	return pageResult, nil
 }
 
-func (d *EntCatRepo) GetByList(m map[string]interface{}) ([]viewmodels.EntCatInfo, error) {
+func (d *EntCatRepo) GetList(m map[string]interface{}) ([]viewmodels.EntCatInfo, error) {
 	keywords := m["keywords"].(string)
 
 	sqlSelect := `SELECT A.* `

repositories/system/group_cat_repo.go

@@ -18,7 +18,7 @@ func NewGroupCatRepo(engine *xorm.Engine) *GroupCatRepo {
 	}
 }
 
-func (d *GroupCatRepo) GetByPage(m map[string]interface{})(*viewmodels.PageResult, error) {
+func (d *GroupCatRepo) GetPage(m map[string]interface{})(*viewmodels.PageResult, error) {
 	ocId     := m["ocId"].(int64)
 	keywords := m["keywords"].(string)
 	limit    := m["limit"].(int)
@@ -57,7 +57,7 @@ func (d *GroupCatRepo) GetByPage(m map[string]interface{})(*viewmodels.PageResul
 
 }
 
-func (d *GroupCatRepo) GetByList(m map[string]interface{})([]viewmodels.GroupCatInfo, error) {
+func (d *GroupCatRepo) GetList(m map[string]interface{})([]viewmodels.GroupCatInfo, error) {
 	ocId     := m["ocId"].(int64)
 	keywords := m["keywords"].(string)
 	

repositories/system/group_member_position_repo.go

@@ -66,7 +66,7 @@ func (d *GroupMemberPositionRepo) GetByAccountId(ocId int64, accountId int64)(*d
 	}
 }
 
-func (d *GroupMemberPositionRepo) GetByList(m map[string]interface{})([]viewmodels.GroupMemberPositionInfo, error){
+func (d *GroupMemberPositionRepo) GetList(m map[string]interface{})([]viewmodels.GroupMemberPositionInfo, error){
 	ocId     := m["ocId"].(int64)
 	keywords := m["keywords"].(string)
 	sqlSelect := `SELECT A.gm_id,

repositories/system/group_member_repo.go

@@ -32,7 +32,7 @@ func (d *GroupMemberRepo) GetById(ocId int64, gmId int64) *datamodels.GroupMembe
 	}
 }
 
-func (d *GroupMemberRepo) GetByList(m map[string]interface{})([]viewmodels.GroupMemberInfo, error) {
+func (d *GroupMemberRepo) GetList(m map[string]interface{})([]viewmodels.GroupMemberInfo, error) {
     ocId      := m["ocId"].(int64)
 	keywords  := m["keywords"].(string)
 	sqlSelect := `SELECT A.gm_id,

repositories/system/group_repo.go

@@ -52,7 +52,7 @@ func (d *GroupRepo) GetById(ocId int64 ,groupId int64)(*viewmodels.GroupInfo, er
     }
 }
 
-func (d *GroupRepo) GetByList(m map[string]interface{})([]viewmodels.GroupInfo, error) {
+func (d *GroupRepo) GetList(m map[string]interface{})([]viewmodels.GroupInfo, error) {
     ocId     := m["ocId"].(int64)
     keywords := m["keywords"].(string)
     

repositories/system/oc_repo.go

@@ -50,7 +50,7 @@ func (d *OcRepo) GetById(ocId int64) (*viewmodels.OcInfo, error) {
 
 }
 
-func (d *OcRepo) GetByPage(m map[string]interface{})(*viewmodels.PageResult, error) {
+func (d *OcRepo) GetPage(m map[string]interface{})(*viewmodels.PageResult, error) {
 	keywords := m["keywords"].(string)
 	limit    := m["limit"].(int)
 	page     := m["page"].(int)
@@ -105,7 +105,7 @@ func (d *OcRepo) GetByPage(m map[string]interface{})(*viewmodels.PageResult, err
 
 }
 
-func (d *OcRepo) GetByList(m map[string]interface{})([]viewmodels.OcInfo, error) {
+func (d *OcRepo) GetList(m map[string]interface{})([]viewmodels.OcInfo, error) {
 	keywords := m["keywords"].(string)
 	sqlSelect := `  SELECT  A.oc_id,
 							A.oc_name,

repositories/system/partner_cat_repo.go

@@ -18,7 +18,7 @@ func NewPartnerCatRepo(engine *xorm.Engine) *PartnerCatRepo {
 	}
 }
 
-func (d *PartnerCatRepo) GetByPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
+func (d *PartnerCatRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
 	keywords := m["keywords"].(string)
 	limit := m["limit"].(int)
 	page := m["page"].(int)
@@ -54,7 +54,7 @@ func (d *PartnerCatRepo) GetByPage(m map[string]interface{}) (*viewmodels.PageRe
 	return pageResult, nil
 }
 
-func (d *PartnerCatRepo) GetByList(m map[string]interface{}) ([]viewmodels.PartnerCatInfo, error) {
+func (d *PartnerCatRepo) GetList(m map[string]interface{}) ([]viewmodels.PartnerCatInfo, error) {
 	keywords := m["keywords"].(string)
 
 	sqlSelect := `SELECT A.* `

repositories/system/position_repo.go

@@ -18,7 +18,7 @@ func NewPositionRepo(engine *xorm.Engine) *PositionRepo {
 	}
 }
 
-func (d *PositionRepo) GetByPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
+func (d *PositionRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
 	ocId     := m["ocId"].(int64)
 	keywords := m["keywords"].(string)
 	limit    := m["limit"].(int)
@@ -55,7 +55,7 @@ func (d *PositionRepo) GetByPage(m map[string]interface{}) (*viewmodels.PageResu
 	return pageResult, nil
 }
 
-func (d *PositionRepo) GetByList(m map[string]interface{}) ([]viewmodels.PositionInfo, error) {
+func (d *PositionRepo) GetList(m map[string]interface{}) ([]viewmodels.PositionInfo, error) {
 	ocId     := m["ocId"].(int64)
 	keywords := m["keywords"].(string)
 

repositories/system/role_repo.go

@@ -18,7 +18,7 @@ func NewRoleRepo(engine *xorm.Engine) *RoleRepo {
 	}
 }
 
-func (d *RoleRepo) GetByPage(m map[string]interface{}) (*viewmodels.PageResult, error){
+func (d *RoleRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error){
 	keywords  := m["keywords"].(string)
 	limit     := m["limit"].(int)
 	page      := m["page"].(int)
@@ -63,7 +63,7 @@ func (d *RoleRepo) GetByPage(m map[string]interface{}) (*viewmodels.PageResult,
 	return pageResult, nil
 }
 
-func (d *RoleRepo) GetByList(m map[string]interface{}) ([]viewmodels.RoleInfo, error) {
+func (d *RoleRepo) GetList(m map[string]interface{}) ([]viewmodels.RoleInfo, error) {
 	keywords := m["keywords"].(string)
 
 	sqlSelect := ` SELECT  A.role_id ,

repositories/system/task_cat_repo.go

@@ -18,7 +18,7 @@ func NewTaskCatRepo(engine *xorm.Engine) *TaskCatRepo {
 	}
 }
 
-func (d *TaskCatRepo) GetByPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
+func (d *TaskCatRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
 	ocId := m["ocId"].(int64)
 	keywords := m["keywords"].(string)
 	limit := m["limit"].(int)
@@ -57,7 +57,7 @@ func (d *TaskCatRepo) GetByPage(m map[string]interface{}) (*viewmodels.PageResul
 
 }
 
-func (d *TaskCatRepo) GetByList(m map[string]interface{}) ([]viewmodels.TaskCatInfo, error) {
+func (d *TaskCatRepo) GetList(m map[string]interface{}) ([]viewmodels.TaskCatInfo, error) {
 	ocId := m["ocId"].(int64)
 	keywords := m["keywords"].(string)
 

repositories/system/user_repo.go

@@ -59,7 +59,7 @@ func (d *UserRepo) GetById(ocId int64, userId int64)(*viewmodels.UserInfo, error
     return data, nil
 }
 
-func (d *UserRepo) GetByPage(m map[string]interface{})(*viewmodels.PageResult, error){
+func (d *UserRepo) GetPage(m map[string]interface{})(*viewmodels.PageResult, error){
     ocId       := m["ocId"].(int64)
     keywords   := m["keywords"].(string)
     limit      := m["limit"].(int)

service/model/model_service.go

@@ -8,8 +8,8 @@ import (
 )
 
 type ModelService interface {
-	GetByList(m map[string]interface{}) ([]viewmodels.ModelInfo, error)
-	GetByPage(m map[string]interface{}) (*viewmodels.PageResult, error)
+	GetList(m map[string]interface{}) ([]viewmodels.ModelInfo, error)
+	GetPage(m map[string]interface{}) (*viewmodels.PageResult, error)
 	GetById(modelId int64) (*viewmodels.ModelInfo, error)
 	Create(d *datamodels.Model) error
 	Update(d *datamodels.Model) error
@@ -26,12 +26,12 @@ func NewModelService() ModelService {
 	}
 }
 
-func (s *modelService) GetByList(m map[string]interface{}) ([]viewmodels.ModelInfo, error) {
-	return s.repo.GetByList(m)
+func (s *modelService) GetList(m map[string]interface{}) ([]viewmodels.ModelInfo, error) {
+	return s.repo.GetList(m)
 }
 
-func (s *modelService) GetByPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
-	return s.repo.GetByPage(m)
+func (s *modelService) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
+	return s.repo.GetPage(m)
 }
 
 func (s *modelService) GetById(modelId int64) (*viewmodels.ModelInfo, error) {

service/model/object_attr_service.go

@@ -8,8 +8,8 @@ import (
 )
 
 type ObjectAttrService interface {
-	GetByList(m map[string]interface{}) ([]viewmodels.ObjectAttrInfo, error)
-	GetByPage(m map[string]interface{}) (*viewmodels.PageResult, error)
+	GetList(m map[string]interface{}) ([]viewmodels.ObjectAttrInfo, error)
+	GetPage(m map[string]interface{}) (*viewmodels.PageResult, error)
 	GetById(modelId, objectId, attrId int64) (*viewmodels.ObjectAttrInfo, error)
 	Create(d *datamodels.ObjectAttr) error
 	Update(d *datamodels.ObjectAttr) error
@@ -26,12 +26,12 @@ func NewObjectAttrService() ObjectAttrService {
 	}
 }
 
-func (s *objectAttrService) GetByList(m map[string]interface{}) ([]viewmodels.ObjectAttrInfo, error) {
-	return s.repo.GetByList(m)
+func (s *objectAttrService) GetList(m map[string]interface{}) ([]viewmodels.ObjectAttrInfo, error) {
+	return s.repo.GetList(m)
 }
 
-func (s *objectAttrService) GetByPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
-	return s.repo.GetByPage(m)
+func (s *objectAttrService) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
+	return s.repo.GetPage(m)
 }
 
 func (s *objectAttrService) GetById(modelId, objectId, attrId int64) (*viewmodels.ObjectAttrInfo, error) {

service/model/object_service.go

@@ -9,8 +9,8 @@ import (
 )
 
 type ObjectService interface {
-	GetByList(m map[string]interface{}) ([]viewmodels.ObjectInfo, error)
-	GetByPage(m map[string]interface{}) (*viewmodels.PageResult, error)
+	GetList(m map[string]interface{}) ([]viewmodels.ObjectInfo, error)
+	GetPage(m map[string]interface{}) (*viewmodels.PageResult, error)
 	GetById(modelId, objectId int64) (*viewmodels.ObjectInfo, error)
 	Create(d *datamodels.Object) error
 	Update(d *datamodels.Object) error
@@ -32,12 +32,12 @@ func NewObjectService() ObjectService {
 	}
 }
 
-func (s *objectService) GetByList(m map[string]interface{}) ([]viewmodels.ObjectInfo, error) {
-	return s.objectRepo.GetByList(m)
+func (s *objectService) GetList(m map[string]interface{}) ([]viewmodels.ObjectInfo, error) {
+	return s.objectRepo.GetList(m)
 }
 
-func (s *objectService) GetByPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
-	return s.objectRepo.GetByPage(m)
+func (s *objectService) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
+	return s.objectRepo.GetPage(m)
 }
 
 func (s *objectService) GetById(modelId, objectId int64) (*viewmodels.ObjectInfo, error) {
@@ -73,7 +73,7 @@ func (s *objectService) GetObjectDataById(modelId, objectId int64) (*viewmodels.
 	m["modelId"] = modelId
 	m["objectId"] = objectId
 	m["keywords"] = ""
-	attrs, err := s.objectAttrRepo.GetByList(m)
+	attrs, err := s.objectAttrRepo.GetList(m)
 	if err != nil {
 		return nil, err
 	}

service/system/app_cat_service.go

@@ -8,8 +8,8 @@ import (
 )
 
 type AppCatService interface {
-	GetByList(m map[string]interface{}) ([]viewmodels.AppCatInfo, error)
-	GetByPage(m map[string]interface{}) (*viewmodels.PageResult, error)
+	GetList(m map[string]interface{}) ([]viewmodels.AppCatInfo, error)
+	GetPage(m map[string]interface{}) (*viewmodels.PageResult, error)
 	GetById(ocId int64, appCatId int64) (*viewmodels.AppCatInfo, error)
 	Create(d *datamodels.AppCat) error
 	Update(d *datamodels.AppCat) error
@@ -26,12 +26,12 @@ func NewAppCatService() AppCatService {
 	}
 }
 
-func (s *appCatService) GetByList(m map[string]interface{}) ([]viewmodels.AppCatInfo, error) {
-	return s.repo.GetByList(m)
+func (s *appCatService) GetList(m map[string]interface{}) ([]viewmodels.AppCatInfo, error) {
+	return s.repo.GetList(m)
 }
 
-func (s *appCatService) GetByPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
-	return s.repo.GetByPage(m)
+func (s *appCatService) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
+	return s.repo.GetPage(m)
 }
 
 func (s *appCatService) GetById(ocId int64, appCatId int64) (*viewmodels.AppCatInfo, error) {

service/system/app_service.go

@@ -8,8 +8,8 @@ import (
 )
 
 type AppService interface {
-	GetByList(m map[string]interface{}) ([]viewmodels.AppInfo, error)
-	GetByPage(m map[string]interface{}) (*viewmodels.PageResult, error)
+	GetList(m map[string]interface{}) ([]viewmodels.AppInfo, error)
+	GetPage(m map[string]interface{}) (*viewmodels.PageResult, error)
 	GetById(appId int64) (*viewmodels.AppInfo, error)
 	Create(d *datamodels.App) error
 	Update(d *datamodels.App) error
@@ -26,12 +26,12 @@ func NewAppService() AppService {
 	}
 }
 
-func (s *appService) GetByList(m map[string]interface{}) ([]viewmodels.AppInfo, error) {
-	return s.repo.GetByList(m)
+func (s *appService) GetList(m map[string]interface{}) ([]viewmodels.AppInfo, error) {
+	return s.repo.GetList(m)
 }
 
-func (s *appService) GetByPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
-	return s.repo.GetByPage(m)
+func (s *appService) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
+	return s.repo.GetPage(m)
 }
 
 func (s *appService) GetById(appId int64) (*viewmodels.AppInfo, error) {

service/system/ent_cat_service.go

@@ -8,8 +8,8 @@ import (
 )
 
 type EntCatService interface {
-	GetByList(m map[string]interface{}) ([]viewmodels.EntCatInfo, error)
-	GetByPage(m map[string]interface{}) (*viewmodels.PageResult, error)
+	GetList(m map[string]interface{}) ([]viewmodels.EntCatInfo, error)
+	GetPage(m map[string]interface{}) (*viewmodels.PageResult, error)
 	GetById(entCatId int64) (*viewmodels.EntCatInfo, error)
 	Create(d *datamodels.EntCat) error
 	Update(d *datamodels.EntCat) error
@@ -26,12 +26,12 @@ func NewEntCatService() EntCatService {
 	}
 }
 
-func (s *entCatService) GetByList(m map[string]interface{}) ([]viewmodels.EntCatInfo, error) {
-	return s.repo.GetByList(m)
+func (s *entCatService) GetList(m map[string]interface{}) ([]viewmodels.EntCatInfo, error) {
+	return s.repo.GetList(m)
 }
 
-func (s *entCatService) GetByPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
-	return s.repo.GetByPage(m)
+func (s *entCatService) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
+	return s.repo.GetPage(m)
 }
 
 func (s *entCatService) GetById(entCatId int64) (*viewmodels.EntCatInfo, error) {

service/system/group_cat_service.go

@@ -8,8 +8,8 @@ import (
 )
 
 type GroupCatService interface {
-    GetByList(m map[string]interface{}) ([]viewmodels.GroupCatInfo, error)
-    GetByPage(m map[string]interface{}) (*viewmodels.PageResult, error)
+    GetList(m map[string]interface{}) ([]viewmodels.GroupCatInfo, error)
+    GetPage(m map[string]interface{}) (*viewmodels.PageResult, error)
     GetById(ocId int64, groupCatId int64) (*viewmodels.GroupCatInfo, error)
     Create(d *datamodels.GroupCat) error
     Update(d *datamodels.GroupCat) error
@@ -26,12 +26,12 @@ func NewGroupCatService() GroupCatService {
     }
 }
 
-func (s *groupCatService) GetByList(m map[string]interface{}) ([]viewmodels.GroupCatInfo, error) {
-    return s.repo.GetByList(m)
+func (s *groupCatService) GetList(m map[string]interface{}) ([]viewmodels.GroupCatInfo, error) {
+    return s.repo.GetList(m)
 }
 
-func (s *groupCatService) GetByPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
-    return s.repo.GetByPage(m)
+func (s *groupCatService) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
+    return s.repo.GetPage(m)
 }
 
 func (s *groupCatService) GetById(ocId int64, groupCatId int64) (*viewmodels.GroupCatInfo, error) {

service/system/group_service.go

@@ -9,7 +9,7 @@ import (
 )
 
 type GroupService interface {
-    GetByList(m map[string]interface{})([]viewmodels.GroupInfo, error)
+    GetList(m map[string]interface{})([]viewmodels.GroupInfo, error)
     GetById(ocId int64 ,groupId int64)(*viewmodels.GroupInfo, error)
     Create(group *datamodels.Group) error
     Update(group *datamodels.Group) error
@@ -32,8 +32,8 @@ func NewGroupService() GroupService{
     }
 }
 
-func (s *groupService) GetByList(m map[string]interface{})([]viewmodels.GroupInfo, error) {
-    return s.groupRepo.GetByList(m)
+func (s *groupService) GetList(m map[string]interface{})([]viewmodels.GroupInfo, error) {
+    return s.groupRepo.GetList(m)
 }
 
 func (s *groupService) GetById(ocId int64 ,gid int64)(*viewmodels.GroupInfo, error) {

service/system/partner_cat_service.go

@@ -8,8 +8,8 @@ import (
 )
 
 type PartnerCatService interface {
-	GetByList(m map[string]interface{}) ([]viewmodels.PartnerCatInfo, error)
-	GetByPage(m map[string]interface{}) (*viewmodels.PageResult, error)
+	GetList(m map[string]interface{}) ([]viewmodels.PartnerCatInfo, error)
+	GetPage(m map[string]interface{}) (*viewmodels.PageResult, error)
 	GetById(partnerCatId int64) (*viewmodels.PartnerCatInfo, error)
 	Create(d *datamodels.PartnerCat) error
 	Update(d *datamodels.PartnerCat) error
@@ -26,12 +26,12 @@ func NewPartnerCatService() PartnerCatService {
 	}
 }
 
-func (s *partnerCatService) GetByList(m map[string]interface{}) ([]viewmodels.PartnerCatInfo, error) {
-	return s.repo.GetByList(m)
+func (s *partnerCatService) GetList(m map[string]interface{}) ([]viewmodels.PartnerCatInfo, error) {
+	return s.repo.GetList(m)
 }
 
-func (s *partnerCatService) GetByPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
-	return s.repo.GetByPage(m)
+func (s *partnerCatService) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
+	return s.repo.GetPage(m)
 }
 
 func (s *partnerCatService) GetById(partnerCatId int64) (*viewmodels.PartnerCatInfo, error) {

service/system/position_service.go

@@ -8,8 +8,8 @@ import (
 )
 
 type PositionService interface {
-	GetByList(m map[string]interface{}) ([]viewmodels.PositionInfo, error)
-	GetByPage(m map[string]interface{}) (*viewmodels.PageResult, error)
+	GetList(m map[string]interface{}) ([]viewmodels.PositionInfo, error)
+	GetPage(m map[string]interface{}) (*viewmodels.PageResult, error)
 	GetById(ocId int64, positionId int64) (*viewmodels.PositionInfo, error)
 	Create(d *datamodels.Position) error
 	Update(d *datamodels.Position) error
@@ -26,12 +26,12 @@ func NewPositionService() PositionService {
 	}
 }
 
-func (s *positionService) GetByList(m map[string]interface{}) ([]viewmodels.PositionInfo, error) {
-	return s.repo.GetByList(m)
+func (s *positionService) GetList(m map[string]interface{}) ([]viewmodels.PositionInfo, error) {
+	return s.repo.GetList(m)
 }
 
-func (s *positionService) GetByPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
-	return s.repo.GetByPage(m)
+func (s *positionService) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
+	return s.repo.GetPage(m)
 }
 
 func (s *positionService) GetById(ocId int64, positionId int64) (*viewmodels.PositionInfo, error) {

service/system/role_service.go

@@ -8,8 +8,8 @@ import (
 )
 
 type RoleService interface {
-	GetByList(m map[string]interface{}) ([]viewmodels.RoleInfo, error)
-	GetByPage(m map[string]interface{}) (*viewmodels.PageResult, error)
+	GetList(m map[string]interface{}) ([]viewmodels.RoleInfo, error)
+	GetPage(m map[string]interface{}) (*viewmodels.PageResult, error)
 	GetById(roleId int64) (*viewmodels.RoleInfo, error)
 	Update(user *datamodels.Role) error
 	Create(user *datamodels.Role) error
@@ -26,12 +26,12 @@ func NewRoleService() RoleService {
 	}
 }
 
-func (s *roleService) GetByList(m map[string]interface{}) ([]viewmodels.RoleInfo, error) {
-	return s.repo.GetByList(m)
+func (s *roleService) GetList(m map[string]interface{}) ([]viewmodels.RoleInfo, error) {
+	return s.repo.GetList(m)
 }
 
-func (s *roleService) GetByPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
-	return s.repo.GetByPage(m)
+func (s *roleService) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
+	return s.repo.GetPage(m)
 }
 
 func (s *roleService) GetById(roleId int64) (*viewmodels.RoleInfo, error) {

service/system/task_cat_service.go

@@ -8,8 +8,8 @@ import (
 )
 
 type TaskCatService interface {
-	GetByList(m map[string]interface{}) ([]viewmodels.TaskCatInfo, error)
-	GetByPage(m map[string]interface{}) (*viewmodels.PageResult, error)
+	GetList(m map[string]interface{}) ([]viewmodels.TaskCatInfo, error)
+	GetPage(m map[string]interface{}) (*viewmodels.PageResult, error)
 	GetById(ocId int64, taskCatId int64) (*viewmodels.TaskCatInfo, error)
 	Create(d *datamodels.TaskCat) error
 	Update(d *datamodels.TaskCat) error
@@ -26,12 +26,12 @@ func NewTaskCatService() TaskCatService {
 	}
 }
 
-func (s *taskCatService) GetByList(m map[string]interface{}) ([]viewmodels.TaskCatInfo, error) {
-	return s.repo.GetByList(m)
+func (s *taskCatService) GetList(m map[string]interface{}) ([]viewmodels.TaskCatInfo, error) {
+	return s.repo.GetList(m)
 }
 
-func (s *taskCatService) GetByPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
-	return s.repo.GetByPage(m)
+func (s *taskCatService) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
+	return s.repo.GetPage(m)
 }
 
 func (s *taskCatService) GetById(ocId int64, taskCatId int64) (*viewmodels.TaskCatInfo, error) {

service/system/user_service.go

@@ -10,7 +10,7 @@ import (
 )
 
 type UserService interface {
-    GetByPage(m map[string]interface{}) (*viewmodels.PageResult, error)
+    GetPage(m map[string]interface{}) (*viewmodels.PageResult, error)
     GetById(ocId, groupId, userId int64) (*viewmodels.UserInfo, error)
     Create(ocTypeId int64, user *viewmodels.UserInfo) error
     Update(user *viewmodels.UserInfo) error
@@ -37,7 +37,7 @@ func NewUserService() UserService {
     }
 }
 
-func (s *userService) GetByPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
+func (s *userService) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
     ocId    := m["ocId"].(int64)
     groupId := m["groupId"].(int64)
     group, err := s.groupRepo.GetById(ocId, groupId)
@@ -49,7 +49,7 @@ func (s *userService) GetByPage(m map[string]interface{}) (*viewmodels.PageResul
     nodeRight := group.NodeRight
     m["nodeLeft"]  = nodeLeft
     m["nodeRight"] = nodeRight
-    return s.userRepo.GetByPage(m)
+    return s.userRepo.GetPage(m)
 }
 
 func (s *userService) GetById(ocId, groupId, userId int64) (*viewmodels.UserInfo, error) {

web/controllers/app_cat_controller.go

@@ -12,26 +12,26 @@ type AppCatController struct {
 }
 
 func (c *AppCatController) BeforeActivation(b mvc.BeforeActivation) {
-    b.Handle("GET",     "/",                    "GetByList" )
-    b.Handle("GET",     "/page",                "GetByPage" )
+    b.Handle("GET",     "/",                    "GetList" )
+    b.Handle("GET",     "/page",                "GetPage" )
     b.Handle("GET",     "/{appCatId:int64}",    "GetById"   )
     b.Handle("POST",    "/add",                 "Create"    )
     b.Handle("PUT",     "/update",              "Update"    )
     b.Handle("DELETE",  "/{appCatId:int64}",    "DeleteByID")
 }
 
-func (c *AppCatController) GetByList() *JsonResult {
+func (c *AppCatController) GetList() *JsonResult {
     params    := c.buildParams()
-    data, err := c.Service.GetByList(params)
+    data, err := c.Service.GetList(params)
     if err != nil {
         return ResultErr(err.Error(), nil)
     }
     return ResultOk("获取成功", data)
 }
 
-func (c *AppCatController) GetByPage() *JsonResult {
+func (c *AppCatController) GetPage() *JsonResult {
     params    := c.buildParams()
-    data, err := c.Service.GetByPage(params)
+    data, err := c.Service.GetPage(params)
     if err != nil {
         return ResultErr(err.Error(), nil)
     } else {

web/controllers/app_controller.go

@@ -12,26 +12,26 @@ type AppController struct {
 }
 
 func (c *AppController) BeforeActivation(b mvc.BeforeActivation) {
-	b.Handle("GET",     "/",                "GetByList")
-	b.Handle("GET",     "/page",            "GetByPage")
+	b.Handle("GET",     "/",                "GetList")
+	b.Handle("GET",     "/page",            "GetPage")
 	b.Handle("GET",     "/{appId:int64}",   "GetById")
 	b.Handle("POST",    "/add",             "Create")
 	b.Handle("PUT",     "/update",          "Update")
 	b.Handle("DELETE",  "/{appId:int64}",   "DeleteByID")
 }
 
-func (c *AppController) GetByList() *JsonResult {
+func (c *AppController) GetList() *JsonResult {
 	params := c.buildParams()
-	data, err := c.Service.GetByList(params)
+	data, err := c.Service.GetList(params)
 	if err != nil {
 		return ResultErr(err.Error(), nil)
 	}
 	return ResultOk("获取成功", data)
 }
 
-func (c *AppController) GetByPage() *JsonResult {
+func (c *AppController) GetPage() *JsonResult {
 	params := c.buildParams()
-	data, err := c.Service.GetByPage(params)
+	data, err := c.Service.GetPage(params)
 	if err != nil {
 		return ResultErr(err.Error(), nil)
 	} else {

web/controllers/ent_cat_controller.go

@@ -12,17 +12,17 @@ type EntCatController struct {
 }
 
 func (c *EntCatController) BeforeActivation(b mvc.BeforeActivation) {
-	b.Handle("GET", "/", "GetByList")
-	b.Handle("GET", "/page", "GetByPage")
+	b.Handle("GET", "/", "GetList")
+	b.Handle("GET", "/page", "GetPage")
 	b.Handle("GET", "/{entCatId:int64}", "GetById")
 	b.Handle("POST", "/add", "Create")
 	b.Handle("PUT", "/update", "Update")
 	b.Handle("DELETE", "/{entCatId:int64}", "DeleteByID")
 }
 
-func (c *EntCatController) GetByList() *JsonResult {
+func (c *EntCatController) GetList() *JsonResult {
 	params := c.buildParams()
-	data, err := c.Service.GetByList(params)
+	data, err := c.Service.GetList(params)
 	if err != nil {
 		return ResultErr(err.Error(), nil)
 	} else {
@@ -30,9 +30,9 @@ func (c *EntCatController) GetByList() *JsonResult {
 	}
 }
 
-func (c *EntCatController) GetByPage() *JsonResult {
+func (c *EntCatController) GetPage() *JsonResult {
 	params := c.buildParams()
-	data, err := c.Service.GetByPage(params)
+	data, err := c.Service.GetPage(params)
 	if err != nil {
 		return ResultErr(err.Error(), nil)
 	} else {

web/controllers/group_cat_controller.go

@@ -12,26 +12,26 @@ type GroupCatController struct {
 }
 
 func (c *GroupCatController) BeforeActivation(b mvc.BeforeActivation) {
-    b.Handle("GET",     "/",                    "GetByList")
-    b.Handle("GET",     "/page",                "GetByPage")
+    b.Handle("GET",     "/",                    "GetList")
+    b.Handle("GET",     "/page",                "GetPage")
     b.Handle("GET",     "/{groupCatId:int64}",  "GetById")
     b.Handle("POST",    "/add",                 "Create")
     b.Handle("PUT",     "/update",              "Update")
     b.Handle("DELETE",  "/{groupCatId:int64}",  "DeleteByID")
 }
 
-func (c *GroupCatController) GetByList() *JsonResult {
+func (c *GroupCatController) GetList() *JsonResult {
     params := c.buildParams()
-    data, err := c.Service.GetByList(params)
+    data, err := c.Service.GetList(params)
     if err != nil {
         return ResultErr(err.Error(), nil)
     }
     return ResultOk("获取成功", data)
 }
 
-func (c *GroupCatController) GetByPage() *JsonResult {
+func (c *GroupCatController) GetPage() *JsonResult {
     params := c.buildParams()
-    data, err := c.Service.GetByPage(params)
+    data, err := c.Service.GetPage(params)
     if err != nil {
         return ResultErr(err.Error(), nil)
     } else {

web/controllers/group_controller.go

@@ -12,18 +12,18 @@ type GroupController struct {
 }
 
 func (c *GroupController) BeforeActivation(b mvc.BeforeActivation) {
-    b.Handle("GET"      ,"/"                                ,"GetByList"   )
+    b.Handle("GET"      ,"/"                                ,"GetList"   )
     b.Handle("GET"      ,"/groupId:int64}"                  ,"GetById"     )
     b.Handle("POST"     ,"/add"                             ,"Create"      )
     b.Handle("PUT"      ,"/update"                          ,"Update"      )
     b.Handle("DELETE"   ,"/{groupId:int64}"                 ,"DeleteById"  )
 }
 
-func (c *GroupController)  GetByList() *JsonResult {
-    ocId := c.GetCurOcId()
+func (c *GroupController)  GetList() *JsonResult {
+    ocId   := c.GetCurOcId()
     params := c.buildParams()
     params["ocId"] = ocId
-    data, err := c.Service.GetByList(params)
+    data, err := c.Service.GetList(params)
     if err != nil {
         return ResultErr(err.Error(), nil)
     }
@@ -41,10 +41,9 @@ func (c *GroupController) GetById(groupId int64) *JsonResult {
 }
 
 func (c *GroupController) Create() *JsonResult {
-    ocId     := c.GetCurOcId()
-    userId   := c.GetCurUserId()
-    
-    group := datamodels.Group{}
+    ocId    := c.GetCurOcId()
+    userId  := c.GetCurUserId()
+    group   := datamodels.Group{}
     err := c.Ctx.ReadJSON(&group)
     if err != nil {
         return ResultErr("读取数据失败", nil)
@@ -63,8 +62,7 @@ func (c *GroupController) Create() *JsonResult {
 func (c *GroupController) Update(groupId int64) *JsonResult {
     ocId     := c.GetCurOcId()
     userId   := c.GetCurUserId()
-    
-    group := datamodels.Group{}
+    group  := datamodels.Group{}
     if err := c.Ctx.ReadJSON(&group); err != nil {
         return ResultErr("读取数据失败", nil)
     }
@@ -83,9 +81,9 @@ func (c *GroupController) DeleteById(groupId int64) *JsonResult {
     ocId   := c.GetCurOcId()
     userId := c.GetCurUserId()
     
-    var m  = make(map[string]interface{})
+    m  := make(map[string]interface{})
     m["ocId"]      = ocId
-    m["groupId"]= groupId
+    m["groupId"]   = groupId
     m["deletedBy"] = userId
     err := c.Service.Delete(m)
     if err != nil {

web/controllers/model_controller.go

@@ -12,26 +12,27 @@ type ModelController struct {
 }
 
 func (c *ModelController) BeforeActivation(b mvc.BeforeActivation) {
-	b.Handle("GET", "/", "GetByList")
-	b.Handle("GET", "/page", "GetByPage")
-	b.Handle("GET", "/{modelId:int64}", "GetById")
-	b.Handle("POST", "/add", "Create")
-	b.Handle("PUT", "/update", "Update")
-	b.Handle("DELETE", "/{modelId:int64}", "DeleteByID")
+	b.Handle("GET",         "/",                "GetList" )
+	b.Handle("GET",         "/page",            "GetPage" )
+	b.Handle("GET",         "/{modelId:int64}", "GetById"   )
+	b.Handle("POST",        "/add",             "Create"    )
+	b.Handle("PUT",         "/update",          "Update"    )
+	b.Handle("DELETE",      "/{modelId:int64}", "DeleteByID")
 }
 
-func (c *ModelController) GetByList() *JsonResult {
-	params := c.buildParams()
-	data, err := c.Service.GetByList(params)
+func (c *ModelController) GetList() *JsonResult {
+	params    := c.buildParams()
+	data, err := c.Service.GetList(params)
 	if err != nil {
 		return ResultErr(err.Error(), nil)
+	} else {
+		return ResultOk("获取成功", data)
 	}
-	return ResultOk("获取成功", data)
 }
 
-func (c *ModelController) GetByPage() *JsonResult {
-	params := c.buildParams()
-	data, err := c.Service.GetByPage(params)
+func (c *ModelController) GetPage() *JsonResult {
+	params    := c.buildParams()
+	data, err := c.Service.GetPage(params)
 	if err != nil {
 		return ResultErr(err.Error(), nil)
 	} else {
@@ -50,8 +51,7 @@ func (c *ModelController) GetById(modelId int64) *JsonResult {
 
 func (c *ModelController) Create() *JsonResult {
 	userId := c.GetCurUserId()
-
-	model := datamodels.Model{}
+	model  := datamodels.Model{}
 	model.CreatedBy = userId
 	err := c.Ctx.ReadJSON(&model)
 	if err != nil {
@@ -68,8 +68,7 @@ func (c *ModelController) Create() *JsonResult {
 
 func (c *ModelController) Update() *JsonResult {
 	userId := c.GetCurUserId()
-
-	model := datamodels.Model{}
+	model  := datamodels.Model{}
 	if err := c.Ctx.ReadJSON(&model); err != nil {
 		return ResultErr("读取数据失败", nil)
 	}
@@ -85,9 +84,8 @@ func (c *ModelController) Update() *JsonResult {
 
 func (c *ModelController) DeleteByID(modelId int64) *JsonResult {
 	userId := c.GetCurUserId()
-
-	var m = make(map[string]interface{})
-	m["modelId"] = modelId
+	m := make(map[string]interface{})
+	m["modelId"]   = modelId
 	m["deletedBy"] = userId
 	err := c.Service.Delete(m)
 	if err != nil {

web/controllers/object_attr_controller.go

@@ -12,26 +12,27 @@ type ObjectAttrController struct {
 }
 
 func (c *ObjectAttrController) BeforeActivation(b mvc.BeforeActivation) {
-	b.Handle("GET", "/", "GetByList")
-	b.Handle("GET", "/page", "GetByPage")
-	b.Handle("GET", "/{modelId:int64}/{objectId:int64}/{attrId:int64}", "GetById")
-	b.Handle("POST", "/add", "Create")
-	b.Handle("PUT", "/update", "Update")
-	b.Handle("DELETE", "/{modelId:int64}/{objectId:int64}/{attrId:int64}", "DeleteByID")
+	b.Handle("GET",     "/",                                                "GetList" )
+	b.Handle("GET",     "/page",                                            "GetPage" )
+	b.Handle("GET",     "/{modelId:int64}/{objectId:int64}/{attrId:int64}", "GetById"   )
+	b.Handle("POST",    "/add",                                             "Create"    )
+	b.Handle("PUT",     "/update",                                          "Update"    )
+	b.Handle("DELETE",  "/{modelId:int64}/{objectId:int64}/{attrId:int64}", "DeleteByID")
 }
 
-func (c *ObjectAttrController) GetByList() *JsonResult {
-	params := c.buildParams()
-	data, err := c.Service.GetByList(params)
+func (c *ObjectAttrController) GetList() *JsonResult {
+	params    := c.buildParams()
+	data, err := c.Service.GetList(params)
 	if err != nil {
 		return ResultErr(err.Error(), nil)
+	} else {
+		return ResultOk("获取成功", data)
 	}
-	return ResultOk("获取成功", data)
 }
 
-func (c *ObjectAttrController) GetByPage() *JsonResult {
-	params := c.buildParams()
-	data, err := c.Service.GetByPage(params)
+func (c *ObjectAttrController) GetPage() *JsonResult {
+	params    := c.buildParams()
+	data, err := c.Service.GetPage(params)
 	if err != nil {
 		return ResultErr(err.Error(), nil)
 	} else {
@@ -50,8 +51,7 @@ func (c *ObjectAttrController) GetById(modelId, objectId, attrId int64) *JsonRes
 
 func (c *ObjectAttrController) Create() *JsonResult {
 	userId := c.GetCurUserId()
-
-	attr := datamodels.ObjectAttr{}
+	attr   := datamodels.ObjectAttr{}
 	attr.CreatedBy = userId
 	err := c.Ctx.ReadJSON(&attr)
 	if err != nil {
@@ -68,8 +68,7 @@ func (c *ObjectAttrController) Create() *JsonResult {
 
 func (c *ObjectAttrController) Update() *JsonResult {
 	userId := c.GetCurUserId()
-
-	attr := datamodels.ObjectAttr{}
+	attr   := datamodels.ObjectAttr{}
 	if err := c.Ctx.ReadJSON(&attr); err != nil {
 		return ResultErr("读取数据失败", nil)
 	}
@@ -85,11 +84,10 @@ func (c *ObjectAttrController) Update() *JsonResult {
 
 func (c *ObjectAttrController) DeleteByID(modelId, objectId, attrId int64) *JsonResult {
 	userId := c.GetCurUserId()
-
-	var m = make(map[string]interface{})
-	m["modelId"] = modelId
-	m["objectId"] = objectId
-	m["attrId"] = attrId
+	m := make(map[string]interface{})
+	m["modelId"]   = modelId
+	m["objectId"]  = objectId
+	m["attrId"]    = attrId
 	m["deletedBy"] = userId
 	err := c.Service.Delete(m)
 	if err != nil {

web/controllers/object_controller.go

@@ -12,36 +12,38 @@ type ObjectController struct {
 }
 
 func (c *ObjectController) BeforeActivation(b mvc.BeforeActivation) {
-	b.Handle("GET", "/", "GetByList")
-	b.Handle("GET", "/page", "GetByPage")
-	b.Handle("GET", "/{modelId:int64}/{objectId:int64}", "GetById")
-	b.Handle("POST", "/add", "Create")
-	b.Handle("PUT", "/update", "Update")
-	b.Handle("DELETE", "/{modelId:int64}/{objectId:int64}", "DeleteByID")
+	b.Handle("GET",         "/",                                 "GetList" )
+	b.Handle("GET",         "/page",                             "GetPage" )
+	b.Handle("GET",         "/{modelId:int64}/{objectId:int64}", "GetById"   )
+	b.Handle("POST",        "/add",                              "Create"    )
+	b.Handle("PUT",         "/update",                           "Update"    )
+	b.Handle("DELETE",      "/{modelId:int64}/{objectId:int64}", "DeleteByID")
 }
 
-func (c *ObjectController) GetByList() *JsonResult {
-	params := c.buildParams()
+func (c *ObjectController) GetList() *JsonResult {
+	params  := c.buildParams()
 	modelId := c.Ctx.URLParamInt64Default("modelId", 0)
 	if modelId <= 0 {
 		return ResultErr("参数不完整", nil)
 	}
 	params["modelId"] = modelId
-	data, err := c.Service.GetByList(params)
+	data, err := c.Service.GetList(params)
 	if err != nil {
 		return ResultErr(err.Error(), nil)
+	} else {
+		return ResultOk("获取成功", data)
 	}
-	return ResultOk("获取成功", data)
 }
 
-func (c *ObjectController) GetByPage() *JsonResult {
-	params := c.buildParams()
+func (c *ObjectController) GetPage() *JsonResult {
+	params  := c.buildParams()
 	modelId := c.Ctx.URLParamInt64Default("modelId", 0)
 	if modelId <= 0 {
 		return ResultErr("参数不完整", nil)
 	}
+	
 	params["modelId"] = modelId
-	data, err := c.Service.GetByPage(params)
+	data, err := c.Service.GetPage(params)
 	if err != nil {
 		return ResultErr(err.Error(), nil)
 	} else {
@@ -59,8 +61,7 @@ func (c *ObjectController) GetById(modelId, objectId int64) *JsonResult {
 }
 
 func (c *ObjectController) Create() *JsonResult {
-	userId := c.GetCurUserId()
-
+	userId     := c.GetCurUserId()
 	objectData := viewmodels.ObjectDataInfo{}
 	objectData.CreatedBy = userId
 	err := c.Ctx.ReadJSON(&objectData)
@@ -77,8 +78,7 @@ func (c *ObjectController) Create() *JsonResult {
 }
 
 func (c *ObjectController) Update() *JsonResult {
-	userId := c.GetCurUserId()
-
+	userId     := c.GetCurUserId()
 	objectData := viewmodels.ObjectDataInfo{}
 	if err := c.Ctx.ReadJSON(&objectData); err != nil {
 		return ResultErr("读取数据失败", nil)
@@ -95,8 +95,7 @@ func (c *ObjectController) Update() *JsonResult {
 
 func (c *ObjectController) DeleteByID(modelId, objectId int64) *JsonResult {
 	userId := c.GetCurUserId()
-
-	var m = make(map[string]interface{})
+	m := make(map[string]interface{})
 	m["modelId"] = modelId
 	m["objectId"] = objectId
 	m["deletedBy"] = userId

web/controllers/partner_cat_controller.go

@@ -12,26 +12,27 @@ type PartnerCatController struct {
 }
 
 func (c *PartnerCatController) BeforeActivation(b mvc.BeforeActivation) {
-	b.Handle("GET", "/", "GetByList")
-	b.Handle("GET", "/page", "GetByPage")
-	b.Handle("GET", "/{partnerCatId:int64}", "GetById")
-	b.Handle("POST", "/add", "Create")
-	b.Handle("PUT", "/update", "Update")
-	b.Handle("DELETE", "/{partnerCatId:int64}", "DeleteByID")
+	b.Handle("GET",         "/",                        "GetList" )
+	b.Handle("GET",         "/page",                    "GetPage" )
+	b.Handle("GET",         "/{partnerCatId:int64}",    "GetById"   )
+	b.Handle("POST",        "/add",                     "Create"    )
+	b.Handle("PUT",         "/update",                  "Update"    )
+	b.Handle("DELETE",      "/{partnerCatId:int64}",    "DeleteByID")
 }
 
-func (c *PartnerCatController) GetByList() *JsonResult {
-	params := c.buildParams()
-	data, err := c.Service.GetByList(params)
+func (c *PartnerCatController) GetList() *JsonResult {
+	params    := c.buildParams()
+	data, err := c.Service.GetList(params)
 	if err != nil {
 		return ResultErr(err.Error(), nil)
+	} else {
+		return ResultOk("获取成功", data)
 	}
-	return ResultOk("获取成功", data)
 }
 
-func (c *PartnerCatController) GetByPage() *JsonResult {
-	params := c.buildParams()
-	data, err := c.Service.GetByPage(params)
+func (c *PartnerCatController) GetPage() *JsonResult {
+	params    := c.buildParams()
+	data, err := c.Service.GetPage(params)
 	if err != nil {
 		return ResultErr(err.Error(), nil)
 	} else {
@@ -49,8 +50,7 @@ func (c *PartnerCatController) GetById(partnerCatId int64) *JsonResult {
 }
 
 func (c *PartnerCatController) Create() *JsonResult {
-	userId := c.GetCurUserId()
-
+	userId     := c.GetCurUserId()
 	partnerCat := datamodels.PartnerCat{}
 	partnerCat.CreatedBy = userId
 	err := c.Ctx.ReadJSON(&partnerCat)
@@ -67,8 +67,7 @@ func (c *PartnerCatController) Create() *JsonResult {
 }
 
 func (c *PartnerCatController) Update() *JsonResult {
-	userId := c.GetCurUserId()
-
+	userId     := c.GetCurUserId()
 	partnerCat := datamodels.PartnerCat{}
 	if err := c.Ctx.ReadJSON(&partnerCat); err != nil {
 		return ResultErr("读取数据失败", nil)
@@ -85,8 +84,7 @@ func (c *PartnerCatController) Update() *JsonResult {
 
 func (c *PartnerCatController) DeleteByID(partnerCatId int64) *JsonResult {
 	userId := c.GetCurUserId()
-
-	var m = make(map[string]interface{})
+	m := make(map[string]interface{})
 	m["partnerCatId"] = partnerCatId
 	m["deletedBy"] = userId
 	err := c.Service.Delete(m)

web/controllers/position_controller.go

@@ -12,26 +12,26 @@ type PositionController struct {
 }
 
 func (c *PositionController) BeforeActivation(b mvc.BeforeActivation) {
-	b.Handle("GET",     "/",                    "GetByList")
-	b.Handle("GET",     "/page",                "GetByPage")
+	b.Handle("GET",     "/",                    "GetList")
+	b.Handle("GET",     "/page",                "GetPage")
 	b.Handle("GET",     "/{positionId:int64}",  "GetById")
 	b.Handle("POST",    "/add",                 "Create")
 	b.Handle("PUT",     "/update",              "Update")
 	b.Handle("DELETE",  "/{positionId:int64}",  "DeleteByID")
 }
 
-func (c *PositionController) GetByList() *JsonResult {
-	params := c.buildParams()
-	data, err := c.Service.GetByList(params)
+func (c *PositionController) GetList() *JsonResult {
+	params    := c.buildParams()
+	data, err := c.Service.GetList(params)
 	if err != nil {
 		return ResultErr(err.Error(), nil)
 	}
 	return ResultOk("获取成功", data)
 }
 
-func (c *PositionController) GetByPage() *JsonResult {
-	params := c.buildParams()
-	data, err := c.Service.GetByPage(params)
+func (c *PositionController) GetPage() *JsonResult {
+	params    := c.buildParams()
+	data, err := c.Service.GetPage(params)
 	if err != nil {
 		return ResultErr(err.Error(), nil)
 	} else {
@@ -40,7 +40,7 @@ func (c *PositionController) GetByPage() *JsonResult {
 }
 
 func (c *PositionController) GetById(positionId int64) *JsonResult {
-	ocId := c.GetCurOcId()
+	ocId      := c.GetCurOcId()
 	data, err := c.Service.GetById(ocId, positionId)
 	if err != nil {
 		return ResultErr(err.Error(), nil)
@@ -52,7 +52,6 @@ func (c *PositionController) GetById(positionId int64) *JsonResult {
 func (c *PositionController) Create() *JsonResult {
 	ocId     := c.GetCurOcId()
 	userId   := c.GetCurUserId()
-	
 	position := datamodels.Position{}
 	position.OcId = ocId
 	position.CreatedBy = userId
@@ -73,7 +72,6 @@ func (c *PositionController) Create() *JsonResult {
 func (c *PositionController) Update() *JsonResult {
 	ocId     := c.GetCurOcId()
 	userId   := c.GetCurUserId()
-	
 	position := datamodels.Position{}
 	if err := c.Ctx.ReadJSON(&position); err != nil {
 		return ResultErr("读取数据失败", nil)
@@ -92,8 +90,7 @@ func (c *PositionController) Update() *JsonResult {
 func (c *PositionController) DeleteByID(positionId int64) *JsonResult {
 	ocId   := c.GetCurOcId()
 	userId := c.GetCurUserId()
-	
-	var m  = make(map[string]interface{})
+	m  := make(map[string]interface{})
 	m["ocId"]      = ocId
 	m["positionId"]= positionId
 	m["deletedBy"] = userId

web/controllers/role_controller.go

@@ -12,17 +12,17 @@ type RoleController struct {
 }
 
 func (c *RoleController) BeforeActivation(b mvc.BeforeActivation) {
-	b.Handle("GET",         "/",                "GetByList")
-	b.Handle("GET",         "/page",            "GetByPage")
-	b.Handle("GET",         "/{roleId:int64}",  "GetById")
-	b.Handle("POST",        "/add",             "Create")
-	b.Handle("PUT",         "/update",          "Update")
+	b.Handle("GET",         "/",                "GetList" )
+	b.Handle("GET",         "/page",            "GetPage" )
+	b.Handle("GET",         "/{roleId:int64}",  "GetById"   )
+	b.Handle("POST",        "/add",             "Create"    )
+	b.Handle("PUT",         "/update",          "Update"    )
 	b.Handle("DELETE",      "/{roleId:int64}",  "DeleteById")
 }
 
-func (c *RoleController) GetByList() *JsonResult {
+func (c *RoleController) GetList() *JsonResult {
 	params := c.buildParams()
-	data, err := c.Service.GetByList(params)
+	data, err := c.Service.GetList(params)
 	if err != nil {
 		return ResultErr(err.Error(), nil)
 	} else {
@@ -30,9 +30,9 @@ func (c *RoleController) GetByList() *JsonResult {
 	}
 }
 
-func (c *RoleController) GetByPage() *JsonResult {
+func (c *RoleController) GetPage() *JsonResult {
 	params := c.buildParams()
-	data, err := c.Service.GetByPage(params)
+	data, err := c.Service.GetPage(params)
 	if err != nil {
 		return ResultErr(err.Error(), nil)
 	} else {
@@ -81,7 +81,7 @@ func (c *RoleController) Update() *JsonResult {
 func (c *RoleController) DeleteById(roleId int64) *JsonResult {
 	userId := c.GetCurUserId()
 	
-	m  := make(map[string]interface{})
+	m := make(map[string]interface{})
 	m["roleId"]    = roleId
 	m["deletedBy"] = userId
 	err := c.Service.Delete(m)

web/controllers/task_cat_controller.go

@@ -12,26 +12,26 @@ type TaskCatController struct {
 }
 
 func (c *TaskCatController) BeforeActivation(b mvc.BeforeActivation) {
-	b.Handle("GET", "/", "GetByList")
-	b.Handle("GET", "/page", "GetByPage")
-	b.Handle("GET", "/{taskCatId:int64}", "GetById")
-	b.Handle("POST", "/add", "Create")
-	b.Handle("PUT", "/update", "Update")
-	b.Handle("DELETE", "/{taskCatId:int64}", "DeleteByID")
+	b.Handle("GET",     "/",                    "GetList" )
+	b.Handle("GET",     "/page",                "GetPage" )
+	b.Handle("GET",     "/{taskCatId:int64}",   "GetById"   )
+	b.Handle("POST",    "/add",                 "Create"    )
+	b.Handle("PUT",     "/update",              "Update"    )
+	b.Handle("DELETE",  "/{taskCatId:int64}",   "DeleteByID")
 }
 
-func (c *TaskCatController) GetByList() *JsonResult {
-	params := c.buildParams()
-	data, err := c.Service.GetByList(params)
+func (c *TaskCatController) GetList() *JsonResult {
+	params    := c.buildParams()
+	data, err := c.Service.GetList(params)
 	if err != nil {
 		return ResultErr(err.Error(), nil)
 	}
 	return ResultOk("获取成功", data)
 }
 
-func (c *TaskCatController) GetByPage() *JsonResult {
-	params := c.buildParams()
-	data, err := c.Service.GetByPage(params)
+func (c *TaskCatController) GetPage() *JsonResult {
+	params    := c.buildParams()
+	data, err := c.Service.GetPage(params)
 	if err != nil {
 		return ResultErr(err.Error(), nil)
 	} else {
@@ -40,7 +40,7 @@ func (c *TaskCatController) GetByPage() *JsonResult {
 }
 
 func (c *TaskCatController) GetById(taskCatId int64) *JsonResult {
-	ocId := c.GetCurOcId()
+	ocId      := c.GetCurOcId()
 	data, err := c.Service.GetById(ocId, taskCatId)
 	if err != nil {
 		return ResultErr(err.Error(), nil)
@@ -50,9 +50,8 @@ func (c *TaskCatController) GetById(taskCatId int64) *JsonResult {
 }
 
 func (c *TaskCatController) Create() *JsonResult {
-	ocId   := c.GetCurOcId()
-	userId := c.GetCurUserId()
-
+	ocId    := c.GetCurOcId()
+	userId  := c.GetCurUserId()
 	taskCat := datamodels.TaskCat{}
 	err := c.Ctx.ReadJSON(&taskCat)
 	if err != nil {
@@ -70,11 +69,10 @@ func (c *TaskCatController) Create() *JsonResult {
 }
 
 func (c *TaskCatController) Update() *JsonResult {
-	ocId   := c.GetCurOcId()
-	userId := c.GetCurUserId()
-
+	ocId    := c.GetCurOcId()
+	userId  := c.GetCurUserId()
 	taskCat := datamodels.TaskCat{}
-	if err := c.Ctx.ReadJSON(&taskCat); err != nil {
+	if err  := c.Ctx.ReadJSON(&taskCat); err != nil {
 		return ResultErr("读取数据失败", nil)
 	}
 
@@ -91,7 +89,7 @@ func (c *TaskCatController) Update() *JsonResult {
 func (c *TaskCatController) DeleteByID(taskCatId int64) *JsonResult {
 	ocId   := c.GetCurOcId()
 	userId := c.GetCurUserId()
-
+	
 	m := make(map[string]interface{})
 	m["ocId"] = ocId
 	m["taskCatId"] = taskCatId

web/controllers/user_controller.go

@@ -12,16 +12,16 @@ type UserController struct {
 }
 
 func (c *UserController) BeforeActivation(b mvc.BeforeActivation) {
-    b.Handle("GET",         "/page",                                "GetByPage")
+    b.Handle("GET",         "/page",                                "GetPage")
     b.Handle("GET",         "/{groupId:int64}/{accountId:int64}",   "GetById")
     b.Handle("POST",        "/add",                                 "Create")
     b.Handle("PUT",         "/update",                              "Update")
     b.Handle("DELETE",      "/{accountId:int64}",                   "DeleteById")
 }
 
-func (c *UserController) GetByPage() *JsonResult {
+func (c *UserController) GetPage() *JsonResult {
     params := c.buildParams()
-    data, err := c.Service.GetByPage(params)
+    data, err := c.Service.GetPage(params)
     if err != nil {
         return ResultErr(err.Error(), nil)
     } else {