权限

src/dashoo.cn/backend/api/business/baseUser/baseUserService.go

@@ -3,7 +3,7 @@ package baseUser
 import (
 	"fmt"
 
-	"dashoo.cn/business/userRole"
+	"dashoo.cn/business2/userRole"
 	. "dashoo.cn/utils/db"
 	"github.com/go-xorm/xorm"
 )

src/dashoo.cn/backend/api/business/role/roleService.go

@@ -4,8 +4,8 @@ import (
 	"strconv"
 	"strings"
 
-	"dashoo.cn/business/permission"
-	"dashoo.cn/business/userRole"
+	"dashoo.cn/business2/permission"
+	"dashoo.cn/business2/userRole"
 	. "dashoo.cn/utils/db"
 	"github.com/go-xorm/xorm"
 )

src/dashoo.cn/backend/api/controllers/base.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/astaxie/beego"
 
-	"dashoo.cn/business/userRole"
+	"dashoo.cn/business2/userRole"
 	"dashoo.cn/backend/api/business/material"
 	"dashoo.cn/backend/api/models"
 	"dashoo.cn/utils"

src/dashoo.cn/backend/api/controllers/casbin/role.go

@@ -1,15 +1,16 @@
 package casbin
 
 import (
+	"dashoo.cn/backend/api/business/role"
 	"strconv"
 	"strings"
 
 	"dashoo.cn/backend/api/controllers"
-	"dashoo.cn/business/casbin/district"
-	"dashoo.cn/business/casbin/module"
-	"dashoo.cn/business/casbin/organize"
-	"dashoo.cn/business/casbin/permission"
-	"dashoo.cn/business/casbin/userRole"
+	"dashoo.cn/business2/district"
+	"dashoo.cn/business2/module"
+	"dashoo.cn/business2/organize"
+	"dashoo.cn/business2/permission"
+	"dashoo.cn/business2/userRole"
 	"dashoo.cn/utils"
 	"github.com/astaxie/beego"
 )
@@ -36,6 +37,26 @@ type DistrictAjaxModel struct {
 	SelectedDistrict []district.Base_Districttree
 }
 
+// @Title 角色列表
+// @Description 获取角色列表
+// @Success 200 {object} controllers.Request
+// @router /list [get]
+func (this *RoleController) RoleList() {
+	svc := role.GetRoleService(utils.DBE)
+	var roles []userRole.Base_Role
+	page := this.GetPageInfoForm()
+	searchkey := this.GetString("keyword")
+	where := "IsVisible=1"
+	if searchkey != "" {
+		where = where + " and Realname like '%" + searchkey + "%'"
+	}
+	total := svc.GetRoleList(page.CurrentPage, page.Size, "CreateOn", utils.ToStr(this.User.Id), &roles, where)
+	var datainfo controllers.DataInfo
+	datainfo.Items = roles
+	datainfo.CurrentItemCount = total
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}
 // @Title 权限
 // @Description 获取菜单操作权限
 // @Success 200 {object} controllers.Request

src/dashoo.cn/backend/api/controllers/casbin/user.go

@@ -1,10 +1,13 @@
 package casbin
 
 import (
+	"dashoo.cn/business2/userRole"
+	"dashoo.cn/business2/permission"
 	"strings"
 
 	"dashoo.cn/backend/api/controllers"
 	"dashoo.cn/utils"
+
 )
 
 // Operations about Users
@@ -26,6 +29,29 @@ func (this *UserController) UserPowerCheckRole() {
 	this.ServeJSON()
 }
 
+// @Title get
+// @Description get user by token
+// @Success 200 {object} models.User
+// @router /list [get]
+func (this *UserController) List() {
+	page := this.GetPageInfoForm()
+	keyword := this.GetString("keyword")
+	svc := permission.GetPermissionService(utils.DBE)
+	var users []userRole.Base_User
+
+	where := "IsVisible=1 and CreateUserId='" + utils.ToStr(this.User.Id) + "' or Id = '" + utils.ToStr(this.User.Id) + "' "
+	if keyword != "" {
+		where = where + " and Realname like '%" + keyword + "%'"
+	}
+	total := svc.GetPagingEntitiesWithOrder(page.CurrentPage, page.Size, "Id", false, &users, where)
+
+	var datainfo controllers.DataInfo
+	datainfo.Items = users
+	datainfo.CurrentItemCount = total
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}
+
 // @Title 用户角色设置
 // @Description 用户角色设置
 // @Success	200	{object} controllers.Request

src/dashoo.cn/backend/api/controllers/common.go

@@ -13,7 +13,7 @@ import (
 	"strings"
 	"time"
 
-	"dashoo.cn/business/permission"
+	"dashoo.cn/business2/permission"
 	"dashoo.cn/labsop"
 	"dashoo.cn/utils"
 	"github.com/axgle/mahonia"

src/dashoo.cn/backend/api/controllers/district.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	//	"fmt"
 
-	"dashoo.cn/business/casbin/district"
+	"dashoo.cn/business2/district"
 	"dashoo.cn/utils"
 )
 

src/dashoo.cn/backend/api/controllers/instrument.go

@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"dashoo.cn/backend/api/business/instrument"
-	"dashoo.cn/business/organize"
-	"dashoo.cn/business/userRole"
+	"dashoo.cn/business2/organize"
+	"dashoo.cn/business2/userRole"
 	"dashoo.cn/utils"
 )
 

src/dashoo.cn/backend/api/controllers/organize.go

@@ -6,7 +6,7 @@ import (
 
 	"strings"
 
-	"dashoo.cn/business/permission"
+	"dashoo.cn/business2/permission"
 	"dashoo.cn/backend/api/business/organize"
 	"dashoo.cn/utils"
 )

src/dashoo.cn/backend/api/controllers/paramset.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"dashoo.cn/business/parameter"
+	"dashoo.cn/business2/parameter"
 	"dashoo.cn/utils"
 )
 

src/dashoo.cn/backend/api/controllers/permission.go

@@ -1,7 +1,7 @@
 package controllers
 
 import (
-	"dashoo.cn/business/casbin/permission"
+	"dashoo.cn/business2/permission"
 	"dashoo.cn/utils"
 	"encoding/json"
 )

src/dashoo.cn/backend/api/controllers/permissions.go

@@ -1,7 +1,7 @@
 package controllers
 
 import (
-	"dashoo.cn/business/permission"
+	"dashoo.cn/business2/permission"
 	"dashoo.cn/utils"
 )
 

src/dashoo.cn/backend/api/controllers/role.go

@@ -4,13 +4,11 @@ import (
 	"encoding/json"
 	"strings"
 
-	"github.com/astaxie/beego"
-
-	"dashoo.cn/business/module"
-	"dashoo.cn/business/permission"
-	"dashoo.cn/business/userRole"
 	"dashoo.cn/backend/api/business/role"
 	"dashoo.cn/backend/api/business/userequipment"
+	"dashoo.cn/business2/module"
+	"dashoo.cn/business2/permission"
+	"dashoo.cn/business2/userRole"
 	"dashoo.cn/utils"
 )
 
@@ -132,18 +130,18 @@ func (this *RoleController) RoleDelete() {
 // @Success 200 {object} controllers.Request
 // @router /getpower [get]
 func (this *RoleController) GetRolePowerAjax() {
-	id := this.GetString("id")
-	svc := permission.GetPermissionService(utils.DBE)
-	currentuser := this.User
-	userid := utils.ToStr(currentuser.Id)
-	ztreecurrentusernodesope := svc.GetPermissionItemsByUser(userid, "0")
-	ztreeselectedusernodesope := svc.GetPermissionItemsByRole(id, "0")
-
-	ztreecurrentusernodesmodu := svc.GetModuleAll(userid, "30")
-	ztreeselectedusernodesmodu := svc.GetModuleTreeAllByRole(id, "30")
-	rest := RolePowerAjaxModel{ztreecurrentusernodesope, ztreeselectedusernodesope, ztreecurrentusernodesmodu, ztreeselectedusernodesmodu}
-	this.Data["json"] = &rest
-	this.ServeJSON()
+	//id := this.GetString("id")
+	//svc := permission.GetPermissionService(utils.DBE)
+	//currentuser := this.User
+	//userid := utils.ToStr(currentuser.Id)
+	//ztreecurrentusernodesope := svc.GetPermissionItemsByUser(userid, "0")
+	//ztreeselectedusernodesope := svc.GetPermissionItemsByRole(id, "0")
+	//
+	//ztreecurrentusernodesmodu := svc.GetModuleAll(userid, "30")
+	//ztreeselectedusernodesmodu := svc.GetModuleTreeAllByRole(id, "30")
+	//rest := RolePowerAjaxModel{ztreecurrentusernodesope, ztreeselectedusernodesope, ztreecurrentusernodesmodu, ztreeselectedusernodesmodu}
+	//this.Data["json"] = &rest
+	//this.ServeJSON()
 }
 
 // @Title 保存权限
@@ -151,37 +149,37 @@ func (this *RoleController) GetRolePowerAjax() {
 // @Success	200	{object} controllers.Request
 // @router /savepower [put]
 func (this *RoleController) RolePowerPost() {
-	svc := permission.GetPermissionService(utils.DBE)
-	roleid := this.GetString("id")
-	var errinfo ErrorInfo
-	if roleid == "" {
-		errinfo.Message = utils.AlertProcess("操作失败！请求信息不完整！")
-		errinfo.Code = -2
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-	}
+	//svc := permission.GetPermissionService(utils.DBE)
+	//roleid := this.GetString("id")
+	//var errinfo ErrorInfo
+	//if roleid == "" {
+	//	errinfo.Message = utils.AlertProcess("操作失败！请求信息不完整！")
+	//	errinfo.Code = -2
+	//	this.Data["json"] = &errinfo
+	//	this.ServeJSON()
+	//}
 
 	//	svc.RevokeRolePermission(roleid)       //撤销角色的操作权限
-	svc.RevokeRoleModulePermission(roleid) //撤销角色的模块访问权限
+	//svc.RevokeRoleModulePermission(roleid) //撤销角色的模块访问权限
 	//	operationids := strings.Split(this.GetString("operids"), ",")
-	moduleids := strings.Split(this.GetString("moduleids"), ",")
-	uid, _ := utils.StrTo(this.User.Id).Int()
+	//moduleids := strings.Split(this.GetString("moduleids"), ",")
+	//uid, _ := utils.StrTo(this.User.Id).Int()
 	//	if this.GetString("operids") != "" {
 	//		for i := 0; i < len(operationids); i++ {
 	//			operationid, _ := utils.StrTo(operationids[i]).Int()
 	//			svc.GrantRolePermission(roleid, operationid, userRole.Base_User{Id: uid, Realname: this.User.Realname})
 	//		}
 	//	}
-	if this.GetString("moduleids") != "" {
-		for j := 0; j < len(moduleids); j++ {
-			moduleid := utils.ToStr(moduleids[j])
-			svc.GrantRoleModulePermission(roleid, moduleid, userRole.Base_User{Id: uid, Realname: this.User.Realname})
-		}
-	}
-	errinfo.Message = utils.AlertProcess("权限保存成功！")
-	errinfo.Code = 0
-	this.Data["json"] = &errinfo
-	this.ServeJSON()
+//	if this.GetString("moduleids") != "" {
+//		for j := 0; j < len(moduleids); j++ {
+//			moduleid := utils.ToStr(moduleids[j])
+//			svc.GrantRoleModulePermission(roleid, moduleid, userRole.Base_User{Id: uid, Realname: this.User.Realname})
+//		}
+//	}
+//	errinfo.Message = utils.AlertProcess("权限保存成功！")
+//	errinfo.Code = 0
+//	this.Data["json"] = &errinfo
+//	this.ServeJSON()
 }
 
 // @Title 获取角色设备权限
@@ -248,44 +246,44 @@ func (this *RoleController) GetRoleItemPowerAjax() {
 // @Success	200	{object} controllers.Request
 // @router /saveOperationPower [put]
 func (this *RoleController) RoleOperationPowerPost() {
-	svc := permission.GetPermissionService(utils.DBE)
-	roleid := this.GetString("id")
-	var errinfo ErrorInfo
-	if roleid == "" {
-		errinfo.Message = utils.AlertProcess("操作失败！请求信息不完整！")
-		errinfo.Code = -2
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-		return
-	}
-
-	svc.RevokeRolePermissionV2(roleid) //撤销角色的操作访问权限
-	operationids := strings.Split(this.GetString("operids"), ",")
-	uid, _ := utils.StrTo(this.User.Id).Int()
-	if this.GetString("operids") != "" {
-		for i := 0; i < len(operationids); i++ {
-			if strings.HasPrefix(operationids[i], "self_") {
-				_operationid := []byte(operationids[i])[5:]
-				operationid, _ := utils.StrTo(_operationid).Int()
-				err := svc.GrantRoleRolePermission(roleid, roleid, operationid, userRole.Base_User{Id: uid, Realname: this.User.Realname})
-				if err != nil {
-					beego.Debug("insert error:", err)
-					continue
-				}
-			} else {
-				operationid, _ := utils.StrTo(operationids[i]).Int()
-				err := svc.GrantRolePermission(roleid, operationid, userRole.Base_User{Id: uid, Realname: this.User.Realname})
-				if err != nil {
-					beego.Debug("insert error:", err)
-					continue
-				}
-			}
-		}
-	}
-	errinfo.Message = utils.AlertProcess("权限保存成功！")
-	errinfo.Code = 0
-	this.Data["json"] = &errinfo
-	this.ServeJSON()
+	//svc := permission.GetPermissionService(utils.DBE)
+	//roleid := this.GetString("id")
+	//var errinfo ErrorInfo
+	//if roleid == "" {
+	//	errinfo.Message = utils.AlertProcess("操作失败！请求信息不完整！")
+	//	errinfo.Code = -2
+	//	this.Data["json"] = &errinfo
+	//	this.ServeJSON()
+	//	return
+	//}
+	//
+	//svc.RevokeRolePermissionV2(roleid) //撤销角色的操作访问权限
+	//operationids := strings.Split(this.GetString("operids"), ",")
+	//uid, _ := utils.StrTo(this.User.Id).Int()
+	//if this.GetString("operids") != "" {
+	//	for i := 0; i < len(operationids); i++ {
+	//		if strings.HasPrefix(operationids[i], "self_") {
+	//			_operationid := []byte(operationids[i])[5:]
+	//			operationid, _ := utils.StrTo(_operationid).Int()
+	//			err := svc.GrantRoleRolePermission(roleid, roleid, operationid, userRole.Base_User{Id: uid, Realname: this.User.Realname})
+	//			if err != nil {
+	//				beego.Debug("insert error:", err)
+	//				continue
+	//			}
+	//		} else {
+	//			operationid, _ := utils.StrTo(operationids[i]).Int()
+	//			err := svc.GrantRolePermission(roleid, operationid, userRole.Base_User{Id: uid, Realname: this.User.Realname})
+	//			if err != nil {
+	//				beego.Debug("insert error:", err)
+	//				continue
+	//			}
+	//		}
+	//	}
+	//}
+	//errinfo.Message = utils.AlertProcess("权限保存成功！")
+	//errinfo.Code = 0
+	//this.Data["json"] = &errinfo
+	//this.ServeJSON()
 }
 
 // @Title 权限
@@ -306,34 +304,34 @@ func (this *RoleController) GetRoleItemRoleAjax() {
 // @Success	200	{object} controllers.Request
 // @router /saveRoleOpsRolePower [post]
 func (this *RoleController) RoleOperationRolePost() {
-	svc := permission.GetPermissionService(utils.DBE)
-	roleid := this.GetString("id")
-	perid := this.GetString("perId")
-	var errinfo ErrorInfo
-	if roleid == "" || perid == "" {
-		errinfo.Message = utils.AlertProcess("操作失败！请求信息不完整！")
-		errinfo.Code = -2
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-		return
-	}
-
-	svc.RevokeRoleRoleScopes(roleid, perid) //撤销角色的操作访问权限
-	roleIds := strings.Split(this.GetString("roleIds"), ",")
-	uid, _ := utils.StrTo(this.User.Id).Int()
-	_perid, _ := utils.StrTo(perid).Int()
-	if this.GetString("roleIds") != "" {
-		for i := 0; i < len(roleIds); i++ {
-			err := svc.GrantRoleRolePermission(roleid, roleIds[i], _perid, userRole.Base_User{Id: uid, Realname: this.User.Realname})
-			if err != nil {
-				beego.Debug("insert error:", err)
-			}
-		}
-	}
-	errinfo.Message = utils.AlertProcess("权限保存成功！")
-	errinfo.Code = 0
-	this.Data["json"] = &errinfo
-	this.ServeJSON()
+	//svc := permission.GetPermissionService(utils.DBE)
+	//roleid := this.GetString("id")
+	//perid := this.GetString("perId")
+	//var errinfo ErrorInfo
+	//if roleid == "" || perid == "" {
+	//	errinfo.Message = utils.AlertProcess("操作失败！请求信息不完整！")
+	//	errinfo.Code = -2
+	//	this.Data["json"] = &errinfo
+	//	this.ServeJSON()
+	//	return
+	//}
+	//
+	//svc.RevokeRoleRoleScopes(roleid, perid) //撤销角色的操作访问权限
+	//roleIds := strings.Split(this.GetString("roleIds"), ",")
+	//uid, _ := utils.StrTo(this.User.Id).Int()
+	//_perid, _ := utils.StrTo(perid).Int()
+	//if this.GetString("roleIds") != "" {
+	//	for i := 0; i < len(roleIds); i++ {
+	//		err := svc.GrantRoleRolePermission(roleid, roleIds[i], _perid, userRole.Base_User{Id: uid, Realname: this.User.Realname})
+	//		if err != nil {
+	//			beego.Debug("insert error:", err)
+	//		}
+	//	}
+	//}
+	//errinfo.Message = utils.AlertProcess("权限保存成功！")
+	//errinfo.Code = 0
+	//this.Data["json"] = &errinfo
+	//this.ServeJSON()
 }
 
 // @Title 权限
@@ -341,18 +339,18 @@ func (this *RoleController) RoleOperationRolePost() {
 // @Success 200 {object} controllers.Request
 // @router /getUsersWithRolePermission [get]
 func (this *RoleController) GetUsersWithRolePermissionAjax() {
-	perCode := this.GetString("perCode")
-	svc := permission.GetPermissionService(utils.DBE)
-	perId := svc.GetPermissionId(perCode)
-	var errinfo ErrorInfo
-	if perId == "" {
-		errinfo.Message = utils.AlertProcess("权限代码错误")
-		errinfo.Code = -1
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-		return
-	}
-	users := svc.GetRolePermissionUserids(this.User.Id, perId, this.User.AccCode)
-	this.Data["json"] = users
-	this.ServeJSON()
+	//perCode := this.GetString("perCode")
+	//svc := permission.GetPermissionService(utils.DBE)
+	//perId := svc.GetPermissionId(perCode)
+	//var errinfo ErrorInfo
+	//if perId == "" {
+	//	errinfo.Message = utils.AlertProcess("权限代码错误")
+	//	errinfo.Code = -1
+	//	this.Data["json"] = &errinfo
+	//	this.ServeJSON()
+	//	return
+	//}
+	//users := svc.GetRolePermissionUserids(this.User.Id, perId, this.User.AccCode)
+	//this.Data["json"] = users
+	//this.ServeJSON()
 }

src/dashoo.cn/backend/api/controllers/token.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/astaxie/beego"
 
-	"dashoo.cn/business/auth"
-	"dashoo.cn/business/userRole"
+	"dashoo.cn/business2/auth"
+	"dashoo.cn/business2/userRole"
 	"dashoo.cn/backend/api/models"
 	"dashoo.cn/utils"
 )

src/dashoo.cn/backend/api/controllers/user.go

@@ -10,9 +10,9 @@ import (
 	"dashoo.cn/backend/api/business/role"
 	"dashoo.cn/backend/api/business/userchannels"
 	"dashoo.cn/backend/api/models"
-	"dashoo.cn/business/auth"
-	"dashoo.cn/business/permission"
-	"dashoo.cn/business/userRole"
+	"dashoo.cn/business2/auth"
+	"dashoo.cn/business2/permission"
+	"dashoo.cn/business2/userRole"
 	"dashoo.cn/utils"
 )
 
@@ -234,7 +234,8 @@ func (this *UserController) UsualWithRole() {
 	if keyword != "" {
 		where = where + " and a.UserName like '%" + keyword + "%'"
 	}
-	total, users := svc.GetUserListWithRole(page.CurrentPage, page.Size, this.User.AccCode+GroupDetailName, orderby, where)
+
+	total, users := svc.GetUserListWithRole(page.CurrentPage, page.Size, orderby, where)
 	var datainfo DataInfo
 	datainfo.Items = users
 	datainfo.CurrentItemCount = total
@@ -247,26 +248,26 @@ func (this *UserController) UsualWithRole() {
 // @Success 200 {object} models.User
 // @router /listwithrole [get]
 func (this *UserController) ListWithRole() {
-	page := this.GetPageInfoForm()
-	keyword := this.GetString("keyword")
-	svc := permission.GetPermissionService(utils.DBE)
-	var users []userRole.UserRoleModel
-	orderby := "m.Id desc"
-	Order := this.GetString("Order")
-	Prop := this.GetString("Prop")
-	if Order != "" && Prop != "" {
-		orderby = Prop + " " + Order
-	}
-	where := "a.IsVisible=1 and a.CreateUserId='" + utils.ToStr(this.User.Id) + "' or a.Id = '" + utils.ToStr(this.User.Id) + "' "
-	if keyword != "" {
-		where = where + " and a.Realname like '%" + keyword + "%'"
-	}
-	total, users := svc.GetPartnerListWithRole(page.CurrentPage, page.Size, this.User.AccCode+GroupDetailName, orderby, where)
-	var datainfo DataInfo
-	datainfo.Items = users
-	datainfo.CurrentItemCount = total
-	this.Data["json"] = &datainfo
-	this.ServeJSON()
+	//page := this.GetPageInfoForm()
+	//keyword := this.GetString("keyword")
+	//svc := permission.GetPermissionService(utils.DBE)
+	//var users []userRole.UserRoleModel
+	//orderby := "m.Id desc"
+	//Order := this.GetString("Order")
+	//Prop := this.GetString("Prop")
+	//if Order != "" && Prop != "" {
+	//	orderby = Prop + " " + Order
+	//}
+	//where := "a.IsVisible=1 and a.CreateUserId='" + utils.ToStr(this.User.Id) + "' or a.Id = '" + utils.ToStr(this.User.Id) + "' "
+	//if keyword != "" {
+	//	where = where + " and a.Realname like '%" + keyword + "%'"
+	//}
+	//total, users := svc.GetPartnerListWithRole(page.CurrentPage, page.Size, this.User.AccCode+GroupDetailName, orderby, where)
+	//var datainfo DataInfo
+	//datainfo.Items = users
+	//datainfo.CurrentItemCount = total
+	//this.Data["json"] = &datainfo
+	//this.ServeJSON()
 }
 
 // @Title 创建用户
@@ -275,7 +276,7 @@ func (this *UserController) ListWithRole() {
 // @Success	200	{object} controllers.Request
 // @router / [post]
 func (this *UserController) AddUser() {
-	var model UserModel
+	/*var model UserModel
 	var jsonblob = this.Ctx.Input.RequestBody
 	json.Unmarshal(jsonblob, &model)
 	var errinfo ErrorDataInfo
@@ -347,7 +348,7 @@ func (this *UserController) AddUser() {
 		this.Data["json"] = &errinfo
 		this.ServeJSON()
 		return
-	}
+	}*/
 }
 
 // @Title 编辑用户
@@ -694,38 +695,38 @@ func (this *UserController) UserChangePWD() {
 // @Success	200	{object} controllers.Request
 // @router /setuserrole/:id [put]
 func (this *UserController) UserPowerPostRole() {
-	svc := userRole.GetUserService(utils.DBE)
-	inputstr := this.Ctx.Input.Param(":id")
-	serial := strings.Split(inputstr, "_")
-	userid := serial[0]
-	var errinfo ErrorInfo
-	if userid == "" || userid == "0" {
-		errinfo.Message = "操作失败！请求信息不完整"
-		errinfo.Code = -2
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-		return
-	}
-	roleids := strings.Split(serial[1], ",")
-	svc.ClearUserRole(userid)
-	entity := svc.GetReport(userid)
-	var err error = nil
-	for i := 0; i < len(roleids); i++ {
-		if roleids[i] != "0" && roleids[i] != "" {
-			err = svc.AddUserToRole(userid, roleids[i], entity[0])
-		}
-	}
-	if err == nil {
-		errinfo.Message = utils.AlertProcess("用户角色调整成功！")
-		errinfo.Code = 0
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-	} else {
-		errinfo.Message = utils.AlertProcess("用户角色调整失败！" + err.Error())
-		errinfo.Code = -1
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-	}
+	//svc := userRole.GetUserService(utils.DBE)
+	//inputstr := this.Ctx.Input.Param(":id")
+	//serial := strings.Split(inputstr, "_")
+	//userid := serial[0]
+	//var errinfo ErrorInfo
+	//if userid == "" || userid == "0" {
+	//	errinfo.Message = "操作失败！请求信息不完整"
+	//	errinfo.Code = -2
+	//	this.Data["json"] = &errinfo
+	//	this.ServeJSON()
+	//	return
+	//}
+	//roleids := strings.Split(serial[1], ",")
+	//svc.ClearUserRole(userid)
+	//entity := svc.GetReport(userid)
+	//var err error = nil
+	//for i := 0; i < len(roleids); i++ {
+	//	if roleids[i] != "0" && roleids[i] != "" {
+	//		err = svc.AddUserToRole(userid, roleids[i], entity[0])
+	//	}
+	//}
+	//if err == nil {
+	//	errinfo.Message = utils.AlertProcess("用户角色调整成功！")
+	//	errinfo.Code = 0
+	//	this.Data["json"] = &errinfo
+	//	this.ServeJSON()
+	//} else {
+	//	errinfo.Message = utils.AlertProcess("用户角色调整失败！" + err.Error())
+	//	errinfo.Code = -1
+	//	this.Data["json"] = &errinfo
+	//	this.ServeJSON()
+	//}
 }
 
 // @Title 获得用户角色id
@@ -860,12 +861,12 @@ func (this *UserController) UserPowerCheckRole() {
 // @Success	200	{object} controllers.Request
 // @router /getusermodule [get]
 func (this *UserController) GetUserModule() {
-	svc := permission.GetPermissionService(utils.DBE)
-	var model UserModuleModel
-	model.A1list = svc.GetModuleAllNamesByCode(this.User.Id, "A1")
-	model.A2list = svc.GetModuleAllNamesByCode(this.User.Id, "A2")
-	this.Data["json"] = model
-	this.ServeJSON()
+	//svc := permission.GetPermissionService(utils.DBE)
+	//var model UserModuleModel
+	//model.A1list = svc.GetModuleAllNamesByCode(this.User.Id, "A1")
+	//model.A2list = svc.GetModuleAllNamesByCode(this.User.Id, "A2")
+	//this.Data["json"] = model
+	//this.ServeJSON()
 }
 
 // @Title 获取用户菜单权限

src/dashoo.cn/frontend_web/src/pages/system/users.vue

@@ -113,7 +113,7 @@
       <el-checkbox :indeterminate="isrolecheckall" v-model="roleCheckAll" @change="handleCheckAllChange">全选</el-checkbox>
       <div style="margin-top:20px;">
         <el-checkbox-group v-model="selectedrole">
-          <el-checkbox v-for="role in rolelist" @change="handlecheckedrolechange" :label="role.Id" :value="role.Id" :key="role">{{role.Realname}}</el-checkbox>
+          <el-checkbox v-for="role in rolelist" @change="handlecheckedrolechange" :label="role.Id" :value="role.Id" :key="role.Id">{{role.Realname}}</el-checkbox>
         </el-checkbox-group>
       </div>
       <div slot="footer">
@@ -265,7 +265,7 @@
           keyword: this.keyword
         }
         // request
-        this.$axios.get('users/usualwithrole', {
+        this.$axios.get('casbin/users/list', {
             params
           })
           .then(res => {
@@ -277,7 +277,7 @@
             // handle error
             console.error(err)
           })
-        this.$axios.get('role/list', {})
+        this.$axios.get('casbin/role/list', {})
           .then(res => {
             // response
             _this.rolelist = res.data.items