diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysUsernumController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysUsernumController.java index 3fe2df3..5f346e1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysUsernumController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysUsernumController.java @@ -101,13 +101,14 @@ public class SysUsernumController extends BaseController { List list = new ArrayList<>(); List sysRoles = new ArrayList<>(); for (SysUser User : sysUsers){ + List sysUserRoles = userService.selectUserRoleByUserId(User.getUserId()); + for (SysUserRole UserRole : sysUserRoles){ + SysRole sysRole = roleService.selectRoleById(UserRole.getRoleId()); + sysRoles.add(sysRole); + } + User.setRoles(sysRoles); if (User.getDeptId().equals(deptId)){ - List sysUserRoles = userService.selectUserRoleByUserId(User.getUserId()); - for (SysUserRole UserRole : sysUserRoles){ - SysRole sysRole = roleService.selectRoleById(UserRole.getRoleId()); - sysRoles.add(sysRole); - } - User.setRoles(sysRoles); + list.add(User); } } diff --git a/ruoyi-admin/src/main/resources/templates/system/usernum/print.html b/ruoyi-admin/src/main/resources/templates/system/usernum/print.html index f7b5f03..593eaed 100644 --- a/ruoyi-admin/src/main/resources/templates/system/usernum/print.html +++ b/ruoyi-admin/src/main/resources/templates/system/usernum/print.html @@ -1,11 +1,1879 @@ - - + + + + - - Title + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
[[${dept.deptName}]]人员信息表
单位：[[${dept.deptName}]]
所属地市 + [[${dept.framework}]] + 所属区县[[${dept.area}]]下属部门
单位名称 + [[${dept.deptName}]] + 人员数量单位编号[[${dept.deptId}]]
人员编号人员姓名人员状态人员性别涉密程度联系方式拟任岗位政治面貌
[[${user.userId}]][[${user.userName}]][[${user.status}]][[${user.sex}]][[${user.shemichengdu}]][[${user.phonenumber}]][[${user.postIds}]][[${user.politics}]]
+ + - \ No newline at end of file + + diff --git a/ruoyi-admin/src/main/resources/templates/system/usernum/usernum.html b/ruoyi-admin/src/main/resources/templates/system/usernum/usernum.html index b15156c..6e1928f 100644 --- a/ruoyi-admin/src/main/resources/templates/system/usernum/usernum.html +++ b/ruoyi-admin/src/main/resources/templates/system/usernum/usernum.html @@ -35,7 +35,7 @@ - + - + @@ -110,7 +110,7 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('详细 '); + actions.push('打印 '); return actions.join(''); } }] }; @@ -120,7 +120,7 @@ $('#btnRefresh').click(function() { queryDeptTree(); }); - + /* 自定义重置-表单重置/隐藏框/树节点选择色/搜索 */ function resetPre() { resetDate(); @@ -143,4 +143,4 @@ - \ No newline at end of file +