From 135d94e0efc86040ec8c3e2a273e945be0428ff2 Mon Sep 17 00:00:00 2001 From: vladp Date: Wed, 4 Feb 2026 13:41:09 +0700 Subject: [PATCH] dev add --- src/main/java/ru/soune/nocopy/controller/UserController.java | 3 ++- src/main/java/ru/soune/nocopy/dto/user/UserDTO.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/ru/soune/nocopy/controller/UserController.java b/src/main/java/ru/soune/nocopy/controller/UserController.java index 6e3c463..52f9e12 100644 --- a/src/main/java/ru/soune/nocopy/controller/UserController.java +++ b/src/main/java/ru/soune/nocopy/controller/UserController.java @@ -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); } diff --git a/src/main/java/ru/soune/nocopy/dto/user/UserDTO.java b/src/main/java/ru/soune/nocopy/dto/user/UserDTO.java index c6346ac..58a0824 100644 --- a/src/main/java/ru/soune/nocopy/dto/user/UserDTO.java +++ b/src/main/java/ru/soune/nocopy/dto/user/UserDTO.java @@ -29,4 +29,5 @@ public class UserDTO { private SubscriptionType subscriptionType; private List tariffs; private TariffInfoDTO tariffInfo; + private Long permission; }