| 
					
				 | 
			
			
				@@ -101,11 +101,9 @@ public class SysUserController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         AjaxResult ajax = AjaxResult.success(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<SysRole> roles = roleService.selectRoleAll(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        ajax.put("posts", postService.selectPostAll()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (StringUtils.isNotNull(userId)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             SysUser sysUser = userService.selectUserById(userId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             ajax.put(AjaxResult.DATA_TAG, sysUser); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            ajax.put("postIds", postService.selectPostListByUserId(userId)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return ajax; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -156,17 +154,29 @@ public class SysUserController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @PreAuthorize("@ss.hasPermi('system:user:remove')") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @Log(title = "用户管理", businessType = BusinessType.DELETE) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    @PostMapping("/del") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public AjaxResult remove(@RequestBody List<SysUser> users) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        Long[] userIds = new Long[users.size()]; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        for (int i = 0; i < users.size(); i++) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            userIds[i] = users.get(i).getUserId(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    @DeleteMapping("/{userIds}") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public AjaxResult remove(@PathVariable Long[] userIds) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (ArrayUtils.contains(userIds, getUserId())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return error("当前用户不能删除"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return toAjax(userService.deleteUserByIds(userIds)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    ///** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    // * 删除用户 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    // */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    //@PreAuthorize("@ss.hasPermi('system:user:remove')") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    //@Log(title = "用户管理", businessType = BusinessType.DELETE) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    //@PostMapping("/del") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    //public AjaxResult remove(@RequestBody List<SysUser> users) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    //    Long[] userIds = new Long[users.size()]; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    //    for (int i = 0; i < users.size(); i++) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    //        userIds[i] = users.get(i).getUserId(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    //    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    //    if (ArrayUtils.contains(userIds, getUserId())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    //        return error("当前用户不能删除"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    //    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    //    return toAjax(userService.deleteUserByIds(userIds)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    //} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     /** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * 重置密码 
			 |