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 @@
-
+
<#form:select path="status" dictType="sys_user_status" blankOption="true" class="form-control isQuick"/>
@@ -87,18 +87,25 @@ <#form:input path="email" maxlength="300" class="form-control width-90"/>
-
- -
- <#form:select name="employee.postCode" items="${postList}" - itemLabel="postName" itemValue="postCode" blankOption="true" class="form-control"/> -
-
<#form:input path="phone" maxlength="100" class="form-control width-90"/>
+
+
+ +
+ <#form:select name="employee.postCode" items="${postList}" + itemLabel="postName" itemValue="postCode" blankOption="true" class="form-control isQuick"/> +
+
+
+ +
+ <#form:select name="roleCode" items="${roleList}" + itemLabel="roleName" itemValue="roleCode" blankOption="true" class="form-control isQuick"/> +