|
@@ -21,7 +21,7 @@ func (c *AppCatController) BeforeActivation(b mvc.BeforeActivation) {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
func (c *AppCatController) GetByList() *JsonResult {
|
|
func (c *AppCatController) GetByList() *JsonResult {
|
|
|
- params := c.buildParams()
|
|
|
|
|
|
|
+ params := c.buildParams()
|
|
|
data, err := c.Service.GetByList(params)
|
|
data, err := c.Service.GetByList(params)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
return ResultErr(err.Error(), nil)
|
|
return ResultErr(err.Error(), nil)
|
|
@@ -30,7 +30,7 @@ func (c *AppCatController) GetByList() *JsonResult {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
func (c *AppCatController) GetByPage() *JsonResult {
|
|
func (c *AppCatController) GetByPage() *JsonResult {
|
|
|
- params := c.buildParams()
|
|
|
|
|
|
|
+ params := c.buildParams()
|
|
|
data, err := c.Service.GetByPage(params)
|
|
data, err := c.Service.GetByPage(params)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
return ResultErr(err.Error(), nil)
|
|
return ResultErr(err.Error(), nil)
|
|
@@ -40,7 +40,7 @@ func (c *AppCatController) GetByPage() *JsonResult {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
func (c *AppCatController) GetById(appCatId int64) *JsonResult {
|
|
func (c *AppCatController) GetById(appCatId int64) *JsonResult {
|
|
|
- ocId := c.GetCurOcId()
|
|
|
|
|
|
|
+ ocId := c.GetCurOcId()
|
|
|
data, err := c.Service.GetById(ocId, appCatId)
|
|
data, err := c.Service.GetById(ocId, appCatId)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
return ResultErr(err.Error(), nil)
|
|
return ResultErr(err.Error(), nil)
|
|
@@ -50,8 +50,7 @@ func (c *AppCatController) GetById(appCatId int64) *JsonResult {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
func (c *AppCatController) Create() *JsonResult {
|
|
func (c *AppCatController) Create() *JsonResult {
|
|
|
- userId := c.GetCurUserId()
|
|
|
|
|
-
|
|
|
|
|
|
|
+ userId := c.GetCurUserId()
|
|
|
appCat := datamodels.AppCat{}
|
|
appCat := datamodels.AppCat{}
|
|
|
appCat.CreatedBy = userId
|
|
appCat.CreatedBy = userId
|
|
|
err := c.Ctx.ReadJSON(&appCat)
|
|
err := c.Ctx.ReadJSON(&appCat)
|
|
@@ -68,8 +67,7 @@ func (c *AppCatController) Create() *JsonResult {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
func (c *AppCatController) Update() *JsonResult {
|
|
func (c *AppCatController) Update() *JsonResult {
|
|
|
- userId := c.GetCurUserId()
|
|
|
|
|
-
|
|
|
|
|
|
|
+ userId := c.GetCurUserId()
|
|
|
appCat := datamodels.AppCat{}
|
|
appCat := datamodels.AppCat{}
|
|
|
if err := c.Ctx.ReadJSON(&appCat); err != nil {
|
|
if err := c.Ctx.ReadJSON(&appCat); err != nil {
|
|
|
return ResultErr("读取数据失败", nil)
|
|
return ResultErr("读取数据失败", nil)
|
|
@@ -87,8 +85,7 @@ func (c *AppCatController) Update() *JsonResult {
|
|
|
func (c *AppCatController) DeleteByID(appCatId int64) *JsonResult {
|
|
func (c *AppCatController) DeleteByID(appCatId int64) *JsonResult {
|
|
|
ocId := c.GetCurOcId()
|
|
ocId := c.GetCurOcId()
|
|
|
userId := c.GetCurUserId()
|
|
userId := c.GetCurUserId()
|
|
|
-
|
|
|
|
|
- var m = make(map[string]interface{})
|
|
|
|
|
|
|
+ m := make(map[string]interface{})
|
|
|
m["ocId"] = ocId
|
|
m["ocId"] = ocId
|
|
|
m["appCatId"]= appCatId
|
|
m["appCatId"]= appCatId
|
|
|
m["deletedBy"] = userId
|
|
m["deletedBy"] = userId
|