角色编辑权限

yuedun · Nov 16, 2020 · 2a913fd · 2a913fd
1 parent 8d0cc79
commit 2a913fd
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/fe/page/user-add.html b/fe/page/user-add.html
@@ -35,7 +35,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">角色</label>
             <div class="layui-input-block">
-                <select name="role">
+                <select name="roleNum">
                     <option value=""></option>
                     <option value="1">超管</option>
                     <option value="2">管理员</option>

diff --git a/fe/page/user-edit.html b/fe/page/user-edit.html
@@ -36,7 +36,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">角色</label>
             <div class="layui-input-block">
-                <select name="role">
+                <select name="roleNum">
                     <option value=""></option>
                     <option value="1">超管</option>
                     <option value="2">管理员</option>
@@ -60,8 +60,8 @@
 
             //监听提交
             form.on('submit(saveBtn)', function (data) {
-                data.field.role = $('select[name=role]').val();
-                data.field.role = parseInt(data.field.role);
+                data.field.roleNum = $('select[name=roleNum]').val();
+                data.field.roleNum = parseInt(data.field.roleNum);
                 var id = data.field.id;
                 delete data.field.id;
                 $.ajax({

diff --git a/fe/page/users.html b/fe/page/users.html
@@ -80,7 +80,7 @@
                     { field: 'username', title: '用户名' },
                     { field: 'email', title: '邮箱', sort: true },
                     { field: 'status', title: '状态' },
-                    { field: 'role', title: '角色' },
+                    { field: 'roleNum', title: '角色' },
                     { title: '操作', minWidth: 150, toolbar: '#currentTableBar', align: "center" }
                 ]],
                 limits: [10, 15, 20, 25, 50, 100],

diff --git a/pkg/permission/handler.go b/pkg/permission/handler.go
@@ -2,7 +2,6 @@ package permission
 
 import (
 	"fmt"
-	"log"
 	"net/http"
 	"strconv"
 
@@ -112,7 +111,7 @@ func DeletePermission(c *gin.Context) {
 	})
 }
 
-//RolePermissions
+//RolePermissions 角色管理-分配权限
 func RolePermissions(c *gin.Context) {
 	roleID, _ := strconv.Atoi(c.Param("roleid"))
 	permissionService := NewService(db.SQLLite)
@@ -132,7 +131,6 @@ func RolePermissions(c *gin.Context) {
 				// break
 			}
 			for _, child := range per.Children {
-				log.Println("per.Children>>>>>>>>>>>>>", rp.ID, child.ID)
 				if rp.ID == child.ID {
 					child.Checked = true
 					per.Checked = false

diff --git a/pkg/permission/service.go b/pkg/permission/service.go
@@ -55,15 +55,15 @@ func (u *permissionService) GetPermissionList() (list []Permission, err error) {
 func (u *permissionService) GetPermissionListForRole() (tree []*PermissionTree, err error) {
 	list := []Permission{}
 	//查询所有父级菜单
-	err = u.db.Model("permission").Where("is_menu = 0 AND parent_id > 0").Find(&list).Error
+	err = u.db.Model("permission").Where("menu_type = 0 AND parent_id > 0").Find(&list).Error
 	for _, pMenu := range list {
 		permis := new(PermissionTree)
 		permis.ID = pMenu.ID
 		permis.Title = pMenu.Title
 		permis.Field = pMenu.Authority
 		permisChildrenList := []Permission{}
 		//获取子菜单
-		err = u.db.Model("permission").Select("id, title").Where("is_menu = 1 AND parent_id = ?", pMenu.ID).Find(&permisChildrenList).Error
+		err = u.db.Model("permission").Select("id, title").Where("menu_type = 1 AND parent_id = ?", pMenu.ID).Find(&permisChildrenList).Error
 		if err != nil {
 			return nil, err
 		}
@@ -121,7 +121,15 @@ func (u *permissionService) CreatePermission(permission *Permission) (err error)
 }
 
 func (u *permissionService) UpdatePermission(ID int, permission *Permission) (err error) {
-	err = u.db.Model(permission).Where("id = ?", ID).Updates(permission).Error
+	upMap := map[string]interface{}{
+		"title":       permission.Title,
+		"orderNumber": permission.OrderNumber,
+		"href":        permission.Href,
+		"icon":        permission.Icon,
+		"authority":   permission.Authority,
+		"menuType":    permission.MenuType,
+	}
+	err = u.db.Model(Permission{}).Where("id = ?", ID).Updates(upMap).Error
 	if err != nil {
 		return err
 	}