From a9f8cd778e88da83fc7ce1798643aac1965739ea Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Wed, 24 Feb 2021 11:18:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=A0=B9=E6=8D=AE=E7=94=A8=E6=88=B7=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/views/modules/sys/user/empUserSelect.html     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserSelect.html b/modules/core/src/main/resources/views/modules/sys/user/empUserSelect.html
index d278b79e..e105e06a 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/empUserSelect.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/empUserSelect.html
@@ -130,7 +130,9 @@ var setting = {view:{selectedMulti:false},data:{simpleData:{enable:true}},
 	if (queryType == 'userType'){
 		$('#queryTypeName').text('${text("按用户类型")}');
 		tree = $.fn.zTree.init($("#tree"), setting, [
-			{id: 'employee', name: '${text("员工类型")}'},
+			<% for(dict in @DictUtils.getDictList('sys_user_type')){ %>
+			{id: '${dict.dictValue}', name: '${text(dict.dictLabel + "类型")}'},
+			<% } %>
 			{id: 'none', name: '${text("系统管理员")}'}
 		]);
 		tree.expandAll(true);
@@ -143,7 +145,7 @@ var setting = {view:{selectedMulti:false},data:{simpleData:{enable:true}},
 			url = "${ctx}/sys/post/treeData?___t=" + new Date().getTime();
 		} else if (queryType == 'role'){
 			$('#queryTypeName').text('${text("按角色查询")}');
-			url = "${ctx}/sys/role/treeData?___t=" + new Date().getTime();
+			url = "${ctx}/sys/role/treeData?userType=__all&___t=" + new Date().getTime();
 		}
 		js.ajaxSubmit(url, {ctrlPermi:'1'/*1拥有的权限 2管理的权限*/}, function(data){
 			tree = $.fn.zTree.init($("#tree"), setting, data);//.expandAll(true);