|
@@ -25,8 +25,9 @@ func (c *RoleController) GetByList() *JsonResult {
|
|
|
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)
|
|
|
|
|
+ } else {
|
|
|
|
|
+ return ResultOk("获取成功", data)
|
|
|
}
|
|
}
|
|
|
- return ResultOk("获取成功", data)
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
func (c *RoleController) GetByPage() *JsonResult {
|
|
func (c *RoleController) GetByPage() *JsonResult {
|
|
@@ -34,24 +35,27 @@ func (c *RoleController) GetByPage() *JsonResult {
|
|
|
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)
|
|
|
|
|
+ } else {
|
|
|
|
|
+ return ResultOk("获取成功", data)
|
|
|
}
|
|
}
|
|
|
- return ResultOk("获取成功", data)
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
func (c *RoleController) GetById(roleId int64) *JsonResult {
|
|
func (c *RoleController) GetById(roleId int64) *JsonResult {
|
|
|
data, err := c.Service.GetById(roleId)
|
|
data, err := c.Service.GetById(roleId)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
return ResultErr(err.Error(), nil)
|
|
return ResultErr(err.Error(), nil)
|
|
|
|
|
+ } else {
|
|
|
|
|
+ return ResultOk("获取成功", data)
|
|
|
}
|
|
}
|
|
|
- return ResultOk("获取成功", data)
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
func (c *RoleController) Create() *JsonResult {
|
|
func (c *RoleController) Create() *JsonResult {
|
|
|
role := &datamodels.Role{}
|
|
role := &datamodels.Role{}
|
|
|
- err := c.Ctx.ReadJSON(role)
|
|
|
|
|
|
|
+ err := c.Ctx.ReadJSON(role)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
return ResultErr("读取数据失败", nil)
|
|
return ResultErr("读取数据失败", nil)
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
err = c.Service.Create(role)
|
|
err = c.Service.Create(role)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
return ResultErr(err.Error(), nil)
|
|
return ResultErr(err.Error(), nil)
|
|
@@ -65,6 +69,7 @@ func (c *RoleController) Update() *JsonResult {
|
|
|
if err := c.Ctx.ReadJSON(role); err != nil {
|
|
if err := c.Ctx.ReadJSON(role); err != nil {
|
|
|
return ResultErr("读取数据失败", nil)
|
|
return ResultErr("读取数据失败", nil)
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
err := c.Service.Update(role)
|
|
err := c.Service.Update(role)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
return ResultErr(err.Error(), nil)
|
|
return ResultErr(err.Error(), nil)
|
|
@@ -76,7 +81,7 @@ func (c *RoleController) Update() *JsonResult {
|
|
|
func (c *RoleController) DeleteById(roleId int64) *JsonResult {
|
|
func (c *RoleController) DeleteById(roleId int64) *JsonResult {
|
|
|
userId := c.GetCurUserId()
|
|
userId := c.GetCurUserId()
|
|
|
|
|
|
|
|
- var m = make(map[string]interface{})
|
|
|
|
|
|
|
+ m := make(map[string]interface{})
|
|
|
m["roleId"] = roleId
|
|
m["roleId"] = roleId
|
|
|
m["deletedBy"] = userId
|
|
m["deletedBy"] = userId
|
|
|
err := c.Service.Delete(m)
|
|
err := c.Service.Delete(m)
|