|
|
@@ -109,7 +109,11 @@ public class UserService {
|
|
|
|
|
|
if (pageQuery.getQuery().containsKey("hasRole")) {
|
|
|
String roleName = (String) pageQuery.getQuery().get("hasRole");
|
|
|
- and.add(criteriaBuilder.isMember(Authority.get(AuthorityName.valueOf(roleName)), root.get("authorities")));
|
|
|
+ if (roleName.equals("ROLE_MINTER")) {
|
|
|
+ and.add(criteriaBuilder.equal(root.get("minter"), true));
|
|
|
+ } else {
|
|
|
+ and.add(criteriaBuilder.isMember(Authority.get(AuthorityName.valueOf(roleName)), root.get("authorities")));
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
if (pageQuery.getQuery().containsKey("vip")) {
|
|
|
@@ -164,7 +168,7 @@ public class UserService {
|
|
|
if (!collection.isOnShelf() || !collection.isSalable()) {
|
|
|
collectionId = null;
|
|
|
} else if (collection.isScheduleSale()) {
|
|
|
- if (collection.getStartTime().isAfter(LocalDateTime.now())){
|
|
|
+ if (collection.getStartTime().isAfter(LocalDateTime.now())) {
|
|
|
collectionId = null;
|
|
|
}
|
|
|
}
|