Skip to content

.4062073974432528:f3bb5a109947907c43e9de39bd8296db_69ead5ada3c75e7cbf9556e6.69eaf1f7a3c75e7cbf9556e8.69eaf1f754b1bff28a4451dd:Trae CN.T(2026/4/24 12:30:47) #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cjbi merged 2 commits into from
Apr 30, 2026
Merged

.4062073974432528:f3bb5a109947907c43e9de39bd8296db_69ead5ada3c75e7cbf9556e6.69eaf1f7a3c75e7cbf9556e8.69eaf1f754b1bff28a4451dd:Trae CN.T(2026/4/24 12:30:47) #96

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b37c72f
feat(用户管理): 添加用户最后登录时间记录和筛选功能
Apr 24, 2026
130b9c9
Merge branch 'main' into trae1
cjbi Apr 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions admin3-server/src/main/java/tech/wetech/admin3/controller/OrganizationController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.web.SortDefault;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
Expand Down Expand Up @@ -51,7 +50,7 @@ public ResponseEntity<List<OrgTreeDTO>> findOrgTree(Long parentId) {

@RequiresPermissions("user:view")
@GetMapping("/{organizationId}/users")
public ResponseEntity<PageDTO<OrgUserDTO>> findOrgUsers(@SortDefault(sort = "lastLoginTime", direction = Sort.Direction.DESC) Pageable pageable, @RequestParam(required = false) String username, @RequestParam(required = false) User.State state, @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime lastLoginTimeStart, @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime lastLoginTimeEnd, @PathVariable Long organizationId) {
public ResponseEntity<PageDTO<OrgUserDTO>> findOrgUsers(@SortDefault(sort = "lastLoginTime", direction = Sort.Direction.DESC) Pageable pageable, @RequestParam(required = false) String username, @RequestParam(required = false) User.State state, @RequestParam(required = false) LocalDateTime lastLoginTimeStart, @RequestParam(required = false) LocalDateTime lastLoginTimeEnd, @PathVariable Long organizationId) {
Organization organization = organizationService.findOrganization(organizationId);
return ResponseEntity.ok(userService.findOrgUsers(pageable, username, state, organization, lastLoginTimeStart, lastLoginTimeEnd));
}
Expand Down
Loading