manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

用户管理界面增加按角色查询用户

Browse Source
This commit is contained in:
thinkgem
2021-05-03 13:44:39 +08:00
parent e1c156e3e3
commit 40c6e42744
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java
View File

@@ -87,6 +87,10 @@ public class EmpUserController extends BaseController {
@RequiresPermissions("sys:empUser:view") @RequiresPermissions("sys:empUser:view")
@RequestMapping(value = "list") @RequestMapping(value = "list")
public String list(EmpUser empUser, Model model) { 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(); Post post = new Post();
model.addAttribute("postList", postService.findList(post)); model.addAttribute("postList", postService.findList(post));
@@ -427,6 +431,10 @@ public class EmpUserController extends BaseController {
if (selectDataJson != null && JSONValidator.from(selectDataJson).validate()){ if (selectDataJson != null && JSONValidator.from(selectDataJson).validate()){
model.addAttribute("selectData", selectDataJson); model.addAttribute("selectData", selectDataJson);
} }
// 获取角色列表
Role role = new Role();
role.setUserType(User.USER_TYPE_MEMBER);
model.addAttribute("roleList", roleService.findList(role));
model.addAttribute("empUser", empUser); model.addAttribute("empUser", empUser);
return "modules/sys/user/empUserSelect"; return "modules/sys/user/empUserSelect";
} }

23
modules/core/src/main/resources/views/modules/sys/user/empUserList.html
View File

@@ -52,7 +52,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label">${text('状态')}：</label> <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"/> <#form:select path="status" dictType="sys_user_status" blankOption="true" class="form-control isQuick"/>
</div> </div>
</div> </div>
@@ -87,18 +87,25 @@
<#form:input path="email" maxlength="300" class="form-control width-90"/> <#form:input path="email" maxlength="300" class="form-control width-90"/>
</div> </div>
</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"> <div class="form-group">
<label class="control-label">${text('电话')}：</label> <label class="control-label">${text('电话')}：</label>
<div class="control-inline"> <div class="control-inline">
<#form:input path="phone" maxlength="100" class="form-control width-90"/> <#form:input path="phone" maxlength="100" class="form-control width-90"/>
</div> </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>
</div> </div>
</#form:form> </#form:form>