From 18e65eda0acbc81d86e99104b682426ce36531e9 Mon Sep 17 00:00:00 2001
From: jinqiming <45981669@qq.com>
Date: Wed, 6 Jan 2021 17:03:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/system/SysRoleController.java  |  1 +
 .../resources/templates/system/role/edit.html | 29 +------------------
 .../resources/templates/system/role/role.html |  9 ------
 3 files changed, 2 insertions(+), 37 deletions(-)

diff --git a/snow-admin/src/main/java/com/snow/web/controller/system/SysRoleController.java b/snow-admin/src/main/java/com/snow/web/controller/system/SysRoleController.java
index d9c006a..86661f9 100644
--- a/snow-admin/src/main/java/com/snow/web/controller/system/SysRoleController.java
+++ b/snow-admin/src/main/java/com/snow/web/controller/system/SysRoleController.java
@@ -102,6 +102,7 @@ public class SysRoleController extends BaseController
         }
         role.setCreateBy(ShiroUtils.getLoginName());
         ShiroUtils.clearCachedAuthorizationInfo();
+        role.setParentId(0L);
         return toAjax(roleService.insertRole(role));
 
     }
diff --git a/snow-admin/src/main/resources/templates/system/role/edit.html b/snow-admin/src/main/resources/templates/system/role/edit.html
index bbfb8ca..5d76744 100644
--- a/snow-admin/src/main/resources/templates/system/role/edit.html
+++ b/snow-admin/src/main/resources/templates/system/role/edit.html
@@ -8,16 +8,6 @@
 	<div class="wrapper wrapper-content animated fadeInRight ibox-content">
 		<form class="form-horizontal m" id="form-role-edit" th:object="${role}">
 			<input id="roleId" name="roleId" type="hidden" th:field="*{roleId}"/>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">父角色名称：</label>
-				<div class="col-sm-8">
-					<div class="input-group">
-						<input id="treeId" name="parentId" type="hidden" th:field="*{parentId}" />
-						<input class="form-control" type="text" onclick="selectRoleTree()" id="treeName" readonly="true" th:field="*{roleName}" required>
-						<span class="input-group-addon"><i class="fa fa-search"></i></span>
-					</div>
-				</div>
-			</div>
 			<div class="form-group">
 				<label class="col-sm-3 control-label is-required">角色名称：</label>
 				<div class="col-sm-8">
@@ -127,23 +117,6 @@
 		    },
 		    focusCleanup: true
 		});
-         /*角色信息-新增-选择父部门树*/
-         function selectRoleTree() {
-             var options = {
-                 title: '角色信息选择',
-                 width: "380",
-                 url: ctx + "system/role/selectRoleTree/" + $("#treeId").val(),
-                 callBack: doSubmit
-             };
-             $.modal.openOptions(options);
-         }
-
-         function doSubmit(index, layero){
-             var body = layer.getChildFrame('body', index);
-             $("#treeId").val(body.find('#treeId').val());
-             $("#treeName").val(body.find('#treeName').val());
-             layer.close(index);
-         }
 		function edit() {
             var parentId = $("input[name='parentId']").val();
 			var roleId = $("input[name='roleId']").val();
@@ -158,7 +131,7 @@
 				type : "POST",
 				url : ctx + "system/role/edit",
 				data : {
-                    "parentId": parentId,
+                    "parentId": 0,
 					"roleId": roleId,
 					"roleName": roleName,
 					"roleKey": roleKey,
diff --git a/snow-admin/src/main/resources/templates/system/role/role.html b/snow-admin/src/main/resources/templates/system/role/role.html
index ebd488c..60c492f 100644
--- a/snow-admin/src/main/resources/templates/system/role/role.html
+++ b/snow-admin/src/main/resources/templates/system/role/role.html
@@ -41,18 +41,9 @@
 				<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:role:add">
 	                <i class="fa fa-plus"></i> 新增
 	            </a>
-	            <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:role:edit">
-		            <i class="fa fa-edit"></i> 修改
-		        </a>
-				<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:role:remove">
-		            <i class="fa fa-remove"></i> 删除
-		        </a>
 		        <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:role:export">
 		            <i class="fa fa-download"></i> 导出
 		        </a>
-				<a class="btn btn-info" id="expandAllBtn">
-					<i class="fa fa-exchange"></i> 展开/折叠
-				</a>
 	        </div>
 	        
 	        <div class="col-sm-12 select-table table-striped">