dev add

2026-02-04 13:41:09 +07:00
parent d1bacb4ac7
commit 135d94e0ef
2 changed files with 3 additions and 1 deletions
@@ -59,7 +59,7 @@ public class UserController {
                .map(u -> new UserDTO(u.getFullName(), u.getCompanyName(), u.getEmail(), u.isActive(),
                        u.getPhone(), u.getGenderType(),
                        u.getBirthday(), u.getCreatedAt(), u.getSubscriptionType(), tariffService.getAllTariffs(),
-                        null))
+                        null, null))
                .toList();

        return ResponseEntity.ok(allUsers);
@@ -121,6 +121,7 @@ public class UserController {
                userDTO.setCreatedAt(user.getCreatedAt());
                userDTO.setSubscriptionType(user.getSubscriptionType());
                userDTO.setActive(user.isActive());
+                userDTO.setPermission(user.getUserPermissions());

                return ResponseEntity.ok(userDTO);
            }