Merge remote-tracking branch 'origin/dev' into bo_daily

This commit is contained in:
김현주
2025-06-26 13:49:53 +09:00
17 changed files with 180 additions and 142 deletions

View File

@@ -17,7 +17,7 @@ class AdminViewDao implements AdminViewPortOut {
@Transactional
public Optional<AdminView> connect(String id) {
return mapper.findById(id).map(admin -> {
admin.setRoles(mapper.findRoleHasPrivilegesByAdminId(admin.getSeq()));
admin.setRole(mapper.findRoleHasPrivilegesByAdminId(admin.getSeq()));
return admin;
});
}

View File

@@ -9,5 +9,5 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface AdminViewMapper {
Optional<AdminView> findById(String id);
List<CoreRole> findRoleHasPrivilegesByAdminId(Long id);
CoreRole findRoleHasPrivilegesByAdminId(Long id);
}

View File

@@ -29,5 +29,5 @@ public class AdminView implements Serializable {
private String createdBy;
private LocalDateTime updatedAt;
private String updatedBy;
private List<CoreRole> roles;
private CoreRole role;
}