diff --git a/admin3-server/src/main/java/tech/wetech/admin3/controller/OrganizationController.java b/admin3-server/src/main/java/tech/wetech/admin3/controller/OrganizationController.java index 90a59317..aaa321f5 100644 --- a/admin3-server/src/main/java/tech/wetech/admin3/controller/OrganizationController.java +++ b/admin3-server/src/main/java/tech/wetech/admin3/controller/OrganizationController.java @@ -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.*; @@ -51,7 +50,7 @@ public ResponseEntity> findOrgTree(Long parentId) { @RequiresPermissions("user:view") @GetMapping("/{organizationId}/users") - public ResponseEntity> 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> 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)); }