涉密人员统计打印

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysUsernumController.java

@@ -101,13 +101,14 @@ public class SysUsernumController extends BaseController {
         List<SysUser> list = new ArrayList<>();
         List<SysRole> sysRoles = new ArrayList<>();
         for (SysUser User : sysUsers){
+            List<SysUserRole> 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<SysUserRole> sysUserRoles = userService.selectUserRoleByUserId(User.getUserId());
+
-                for (SysUserRole UserRole : sysUserRoles){
-                    SysRole sysRole = roleService.selectRoleById(UserRole.getRoleId());
-                    sysRoles.add(sysRole);
-                }
-                User.setRoles(sysRoles);
                 list.add(User);
             }
         }

ruoyi-admin/src/main/resources/templates/system/usernum/usernum.html

@@ -35,7 +35,7 @@
 						</div>
 					</form>
 				</div>
-				
+
 		        <div class="btn-group-sm" id="toolbar" role="group">
 		            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:usernum:export">
 			            <i class="fa fa-download"></i> 导出
@@ -47,7 +47,7 @@
 			</div>
 		</div>
 	</div>
-	
+
 	<th:block th:include="include :: footer" />
 	<th:block th:include="include :: layout-latest-js" />
 	<th:block th:include="include :: ztree-js" />
@@ -110,7 +110,7 @@
 		            align: 'center',
 		            formatter: function(value, row, index) {
 						var actions = [];
-						actions.push('<a class="btn btn-warning btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="print(\'' + row.deptId + '\')"><i class="fa fa-search"></i>详细</a> ');
+						actions.push('<a class="btn btn-info btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="print(\'' + row.deptId + '\')"><i class="fa fa-download"></i>打印</a> ');
 						return actions.join('');		            }
 		        }]
 		    };
@@ -120,7 +120,7 @@
 		$('#btnRefresh').click(function() {
 			queryDeptTree();
 		});
-		
+
 		/* 自定义重置-表单重置/隐藏框/树节点选择色/搜索 */
 		function resetPre() {
 			resetDate();
@@ -143,4 +143,4 @@
 
 	</script>
 </body>
-</html>
+</html>