init

repositories/system/app_cat_repo.go

@@ -19,18 +19,17 @@ func NewAppCatRepo(engine *xorm.Engine) *AppCatRepo {
 }
 
 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 + "%'"
+	sqlSelect := ` SELECT A.*                `
+	sqlFrom   := ` FROM   app_cat   AS A     `
+	sqlWhere  := ` WHERE  A.deleted_flag = 0 `
+	if keywords, ok := m["keywords"]; ok {
+		sqlWhere += " AND A.app_cat_title like '%" + fmt.Sprintf("%s", keywords) + "%' "
 	}
 
-	sqlCount := `SELECT COUNT(*) `
+	sqlCount := ` SELECT COUNT(*) `
 	total, err1 := d.engine.SQL(sqlCount + sqlFrom + sqlWhere).Count(new(datamodels.AppCat))
 	if err1 != nil {
 		return nil, err1
@@ -47,10 +46,10 @@ func (d *AppCatRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult,
 	}
 
 	pageResult := &viewmodels.PageResult{}
-	pageResult.Data = datalist
-	pageResult.Total = total
+	pageResult.Data     = datalist
+	pageResult.Total    = total
 	pageResult.PageSize = limit
-	pageResult.Page = page
+	pageResult.Page     = page
 	return pageResult, nil
 }
 
@@ -72,7 +71,7 @@ func (d *AppCatRepo) GetList(m map[string]interface{}) ([]viewmodels.AppCatInfo,
 	return datalist, nil
 }
 
-func (d *AppCatRepo) GetById(ocId int64, appCatId int64) (*viewmodels.AppCatInfo, error) {
+func (d *AppCatRepo) GetById(appCatId int64) (*viewmodels.AppCatInfo, error) {
 	data := &viewmodels.AppCatInfo{}
 	ok, err := d.engine.Where("app_cat_id = ?", appCatId).Get(data)
 	if !ok && err == nil {

service/system/app_cat_service.go

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

web/controllers/app_cat_controller.go

@@ -12,12 +12,12 @@ type AppCatController struct {
 }
 
 func (c *AppCatController) BeforeActivation(b mvc.BeforeActivation) {
-    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")
+    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) GetList() *JsonResult {
@@ -40,8 +40,7 @@ func (c *AppCatController) GetPage() *JsonResult {
 }
 
 func (c *AppCatController) GetById(appCatId int64) *JsonResult {
-    ocId      := c.GetCurOcId()
-    data, err := c.Service.GetById(ocId, appCatId)
+    data, err := c.Service.GetById(appCatId)
     if err != nil {
         return ResultErr(err.Error(), nil)
     } else {
@@ -87,7 +86,7 @@ func (c *AppCatController) DeleteByID(appCatId int64) *JsonResult {
     userId := c.GetCurUserId()
     m := make(map[string]interface{})
     m["ocId"]      = ocId
-    m["appCatId"]= appCatId
+    m["appCatId"]  = appCatId
     m["deletedBy"] = userId
     err := c.Service.Delete(m)
     if err != nil {