init

repositories/model/model_repo.go

@@ -19,28 +19,28 @@ func NewModelRepo(engine *xorm.Engine) *ModelRepo {
 }
 
 func (d *ModelRepo) GetByPage(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_model   AS A `
-	sqlWhere := `WHERE A.deleted_flag = 0 `
+	sqlFrom   := `FROM   ds_model   AS A `
+	sqlWhere  := `WHERE A.deleted_flag = 0 `
 	if keywords != "" {
 		sqlWhere += ` AND A.model_title like ` + "'%" + keywords + "%'"
 	}
 
-	sqlCount := `SELECT COUNT(*) `
+	sqlCount  := `SELECT COUNT(*) `
 	total, err1 := d.engine.SQL(sqlCount + sqlFrom + sqlWhere).Count(new(datamodels.Model))
 	if err1 != nil {
 		return nil, err1
 	}
 
-	sqlOrderBy := " ORDER BY model_id DESC "
-	pageStart := (page - 1) * limit
-	sqlLimit := fmt.Sprintf(" LIMIT %d OFFSET %d ", limit, pageStart)
+	sqlOrderBy := " ORDER BY model_id ASC "
+	pageStart  := (page - 1) * limit
+	sqlLimit   := fmt.Sprintf(" LIMIT %d OFFSET %d ", limit, pageStart)
 
-	datalist := make([]datamodels.Model, 0)
+	datalist   := make([]datamodels.Model, 0)
 	err2 := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy + sqlLimit).Find(&datalist)
 	if err2 != nil {
 		return nil, err2
@@ -58,13 +58,13 @@ func (d *ModelRepo) GetByList(m map[string]interface{}) ([]viewmodels.ModelInfo,
 	keywords := m["keywords"].(string)
 
 	sqlSelect := `SELECT A.* `
-	sqlFrom := `FROM  ds_model   AS A    `
-	sqlWhere := `WHERE A.deleted_flag = 0 `
+	sqlFrom   := `FROM  ds_model   AS A    `
+	sqlWhere  := `WHERE A.deleted_flag = 0 `
 	if keywords != "" {
 		sqlWhere += ` AND   A.model_title like ` + "'%" + keywords + "%'"
 	}
 
-	sqlOrderBy := " ORDER BY model_id DESC "
+	sqlOrderBy := " ORDER BY model_id ASC "
 	datalist := make([]viewmodels.ModelInfo, 0)
 	err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy).Find(&datalist)
 	if err != nil {

repositories/system/app_repo.go

@@ -19,27 +19,28 @@ func NewAppRepo(engine *xorm.Engine) *AppRepo {
 }
 
 func (d *AppRepo) 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   AS A
-                  LEFT  JOIN app_cat AS B ON(A.app_cat_id = B.app_cat_id)`
-	sqlWhere := `WHERE A.deleted_flag = 0 `
+	keywords  := m["keywords"].(string)
+	limit     := m["limit"].(int)
+	page      := m["page"].(int)
+
+	sqlSelect := ` SELECT A.* ,
+                          B.app_cat_title `
+	sqlFrom   := ` FROM       app     AS A
+                   LEFT  JOIN app_cat AS B ON (A.app_cat_id = B.app_cat_id)`
+	sqlWhere  := ` WHERE A.deleted_flag = 0 `
 	if keywords != "" {
 		sqlWhere += ` AND A.app_title like ` + "'%" + keywords + "%'"
 	}
 
-	sqlCount := `SELECT COUNT(*) `
+	sqlCount    := ` SELECT COUNT(*) `
 	total, err1 := d.engine.SQL(sqlCount + sqlFrom + sqlWhere).Count(new(datamodels.App))
 	if err1 != nil {
 		return nil, err1
 	}
 
 	sqlOrderBy := " ORDER BY app_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.App, 0)
 	err2 := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy + sqlLimit).Find(&datalist)
@@ -58,16 +59,17 @@ func (d *AppRepo) GetByPage(m map[string]interface{}) (*viewmodels.PageResult, e
 func (d *AppRepo) GetByList(m map[string]interface{}) ([]viewmodels.AppInfo, error) {
 	keywords := m["keywords"].(string)
 
-	sqlSelect := `SELECT     A.* `
-	sqlFrom := `FROM       app   AS A
-                  LEFT  JOIN app_cat AS B ON(A.app_cat_id = B.app_cat_id)`
-	sqlWhere := `WHERE A.deleted_flag = 0 `
+	sqlSelect := ` SELECT     A.* ,
+                              B.app_cat_title`
+	sqlFrom   := ` FROM       app   AS A
+                   LEFT  JOIN app_cat AS B ON (A.app_cat_id = B.app_cat_id)`
+	sqlWhere  := ` WHERE A.deleted_flag = 0 `
 	if keywords != "" {
 		sqlWhere += ` AND   A.app_title like ` + "'%" + keywords + "%'"
 	}
 
 	sqlOrderBy := " ORDER BY app_id DESC "
-	datalist := make([]viewmodels.AppInfo, 0)
+	datalist   := make([]viewmodels.AppInfo, 0)
 	err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy).Find(&datalist)
 	if err != nil {
 		return nil, err
@@ -75,9 +77,16 @@ func (d *AppRepo) GetByList(m map[string]interface{}) ([]viewmodels.AppInfo, err
 	return datalist, nil
 }
 
-func (d *AppRepo) GetById(ocId int64, appId int64) (*viewmodels.AppInfo, error) {
-	data := &viewmodels.AppInfo{}
-	ok, err := d.engine.Where("app_id = ?", appId).Get(data)
+func (d *AppRepo) GetById(appId int64) (*viewmodels.AppInfo, error) {
+	sqlSelect := ` SELECT     A.* ,
+                              B.app_cat_title`
+	sqlFrom   := ` FROM       app     AS A
+                   LEFT  JOIN app_cat AS B ON (A.app_cat_id = B.app_cat_id)`
+	sqlWhere  := ` WHERE A.deleted_flag = 0 AND A.app_id =`+ fmt.Sprintf("%d", appId)
+
+	
+	data      := &viewmodels.AppInfo{}
+	ok, err   := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere).Limit(1).Get(data)
 	if !ok && err == nil {
 		return nil, err
 	} else {

service/system/app_service.go

@@ -10,7 +10,7 @@ import (
 type AppService interface {
 	GetByList(m map[string]interface{}) ([]viewmodels.AppInfo, error)
 	GetByPage(m map[string]interface{}) (*viewmodels.PageResult, error)
-	GetById(ocId int64, appId int64) (*viewmodels.AppInfo, error)
+	GetById(appId int64) (*viewmodels.AppInfo, error)
 	Create(d *datamodels.App) error
 	Update(d *datamodels.App) error
 	Delete(m map[string]interface{}) error
@@ -34,8 +34,8 @@ func (s *appService) GetByPage(m map[string]interface{}) (*viewmodels.PageResult
 	return s.repo.GetByPage(m)
 }
 
-func (s *appService) GetById(ocId int64, appId int64) (*viewmodels.AppInfo, error) {
-	return s.repo.GetById(ocId, appId)
+func (s *appService) GetById(appId int64) (*viewmodels.AppInfo, error) {
+	return s.repo.GetById(appId)
 }
 
 func (s *appService) Create(App *datamodels.App) error {

web/controllers/app_controller.go

@@ -12,12 +12,12 @@ type AppController struct {
 }
 
 func (c *AppController) BeforeActivation(b mvc.BeforeActivation) {
-	b.Handle("GET", "/", "GetByList")
-	b.Handle("GET", "/page", "GetByPage")
-	b.Handle("GET", "/{appId:int64}", "GetById")
-	b.Handle("POST", "/add", "Create")
-	b.Handle("PUT", "/update", "Update")
-	b.Handle("DELETE", "/{appId:int64}", "DeleteByID")
+	b.Handle("GET",     "/",                "GetByList")
+	b.Handle("GET",     "/page",            "GetByPage")
+	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 {
@@ -40,8 +40,7 @@ func (c *AppController) GetByPage() *JsonResult {
 }
 
 func (c *AppController) GetById(appId int64) *JsonResult {
-	ocId := c.GetCurOcId()
-	data, err := c.Service.GetById(ocId, appId)
+	data, err := c.Service.GetById(appId)
 	if err != nil {
 		return ResultErr(err.Error(), nil)
 	} else {
@@ -85,7 +84,7 @@ func (c *AppController) Update() *JsonResult {
 }
 
 func (c *AppController) DeleteByID(appId int64) *JsonResult {
-	ocId := c.GetCurOcId()
+	ocId   := c.GetCurOcId()
 	userId := c.GetCurUserId()
 
 	var m = make(map[string]interface{})