From 40c6e427444ac21e6c4f86e9b8c70cea6008c0fc Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 3 May 2021 13:44:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E6=8C=89=E8=A7=92=E8=89=B2=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/web/user/EmpUserController.java       |  8 +++++++
 .../views/modules/sys/user/empUserList.html   | 23 ++++++++++++-------
 2 files changed, 23 insertions(+), 8 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 49980f0e..47728572 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
@@ -87,6 +87,10 @@ public class EmpUserController extends BaseController {
 	@RequiresPermissions("sys:empUser:view")
 	@RequestMapping(value = "list")
 	public String list(EmpUser empUser, Model model) {
+		// 获取角色列表
+		Role role = new Role();
+		role.setUserType(User.USER_TYPE_EMPLOYEE);
+		model.addAttribute("roleList", roleService.findList(role));
 		// 获取岗位列表
 		Post post = new Post();
 		model.addAttribute("postList", postService.findList(post));
@@ -427,6 +431,10 @@ public class EmpUserController extends BaseController {
 		if (selectDataJson != null && JSONValidator.from(selectDataJson).validate()){
 			model.addAttribute("selectData", selectDataJson);
 		}
+		// 获取角色列表
+		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/empUserList.html b/modules/core/src/main/resources/views/modules/sys/user/empUserList.html
index 24bedeac..7c8d41dd 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/empUserList.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/empUserList.html
@@ -52,7 +52,7 @@
 				</div>
 				<div class="form-group">
 					<label class="control-label">${text('状态')}：</label>
-					<div class="control-inline width-60">
+					<div class="control-inline width-90">
 						<#form:select path="status" dictType="sys_user_status" blankOption="true" class="form-control isQuick"/>
 					</div>
 				</div>
@@ -87,18 +87,25 @@
 							<#form:input path="email" maxlength="300" class="form-control width-90"/>
 						</div>
 					</div>
-					<div class="form-group">
-						<label class="control-label">${text('岗位')}：</label>
-						<div class="control-inline width-90">
-							<#form:select name="employee.postCode" items="${postList}"
-								itemLabel="postName" itemValue="postCode" blankOption="true" class="form-control"/>
-						</div>
-					</div>
 					<div class="form-group">
 						<label class="control-label">${text('电话')}：</label>
 						<div class="control-inline">
 							<#form:input path="phone" maxlength="100" class="form-control width-90"/>
 						</div>
+					</div>
+					<div class="form-group">
+						<label class="control-label">${text('岗位')}：</label>
+						<div class="control-inline width-90">
+							<#form:select name="employee.postCode" items="${postList}"
+								itemLabel="postName" itemValue="postCode" blankOption="true" class="form-control isQuick"/>
+						</div>
+					</div>
+					<div class="form-group">
+						<label class="control-label">${text('角色')}：</label>
+						<div class="control-inline width-120">
+							<#form:select name="roleCode" items="${roleList}"
+								itemLabel="roleName" itemValue="roleCode" blankOption="true" class="form-control isQuick"/>
+						</div>
 					</div>
 				</div>
 			</#form:form>