From ce50c1b0c4207ad0d74ce4275030c21494077d8e Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Wed, 20 Oct 2021 10:19:40 +0800
Subject: [PATCH] =?UTF-8?q?empUserSelect=E7=9A=84=E6=9C=BA=E6=9E=84?=
 =?UTF-8?q?=E5=92=8C=E8=A7=92=E8=89=B2=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?isAll=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeesite/modules/sys/web/user/EmpUserController.java   | 6 +++---
 .../resources/views/modules/sys/user/empUserSelect.html   | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java
index 47728572..21b09286 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java
@@ -432,9 +432,9 @@ public class EmpUserController extends BaseController {
 			model.addAttribute("selectData", selectDataJson);
 		}
 		// 获取角色列表
-		Role role = new Role();
-		role.setUserType(User.USER_TYPE_MEMBER);
-		model.addAttribute("roleList", roleService.findList(role));
+//		Role role = new Role();
+//		role.setUserType(User.USER_TYPE_MEMBER);
+//		model.addAttribute("roleList", roleService.findList(role));
 		model.addAttribute("empUser", empUser);
 		return "modules/sys/user/empUserSelect";
 	}
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 31186f60..00adebd9 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
@@ -31,7 +31,7 @@
 				<#form:form id="searchForm" model="${empUser}" action="${ctx}/sys/empUser/listData" method="post" class="form-inline "
 						data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
 					<#form:hidden name="status" value="${isNotBlank(empUser.status) ? empUser.status : '0'}" class="isReset"/>
-					<#form:hidden name="isAll" value="${parameter.isAll}" class="isReset"/>
+					<#form:hidden name="isAll" value="${parameter.isAll}" class=""/>
 					<#form:hidden id="postCode" name="employee.postCode" class="isReset"/>
 					<#form:hidden id="roleCode" name="roleCode" class="isReset"/>
 					<#form:hidden id="userType" name="userType" class="isReset"/>
@@ -58,7 +58,7 @@
 						<div class="control-inline width-90">
 							<#form:treeselect id="office" title="${text('机构选择')}"
 									path="employee.office.officeCode" labelPath="employee.office.officeName" 
-									url="${ctx}/sys/office/treeData" btnClass="btn-sm" allowClear="true" canSelectParent="true"/>
+									url="${ctx}/sys/office/treeData?isAll=${parameter.isAll}" btnClass="btn-sm" allowClear="true" canSelectParent="true"/>
 						</div>
 					</div>
 					<div class="form-group">
@@ -139,13 +139,13 @@ var setting = {view:{selectedMulti:false},data:{simpleData:{enable:true}},
 	}else{
 		if (!queryType || queryType == 'office'){
 			$('#queryTypeName').text('${text("按组织查询")}');
-			url = "${ctx}/sys/office/treeData?___t=" + new Date().getTime();
+			url = "${ctx}/sys/office/treeData?isAll=${parameter.isAll}&___t=" + new Date().getTime();
 		} else if (queryType == 'post'){
 			$('#queryTypeName').text('${text("按岗位查询")}');
 			url = "${ctx}/sys/post/treeData?___t=" + new Date().getTime();
 		} else if (queryType == 'role'){
 			$('#queryTypeName').text('${text("按角色查询")}');
-			url = "${ctx}/sys/role/treeData?userType=__all&___t=" + new Date().getTime();
+			url = "${ctx}/sys/role/treeData?isAll=${parameter.isAll}&userType=__all&___t=" + new Date().getTime();
 		}
 		js.ajaxSubmit(url, {ctrlPermi:'1'/*1拥有的权限 2管理的权限*/}, function(data){
 			tree = $.fn.zTree.init($("#tree"), setting, data);//.expandAll(true);