Merge remote-tracking branch 'origin/dev' into bo_daily
This commit is contained in:
@@ -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;
|
||||
});
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user