|
|
@@ -424,24 +424,20 @@ public class AssetService {
|
|
|
if (ObjectUtils.isEmpty(query.get("toUserId")) && ObjectUtils.isEmpty(query.get("fromUserId"))) {
|
|
|
and.add(criteriaBuilder.or(criteriaBuilder.equal(root.get("toUserId"), userId), criteriaBuilder.equal(root.get("fromUserId"), userId)));
|
|
|
} else {
|
|
|
- if (ObjectUtils.isNotEmpty(query.get("toUserId"))) {
|
|
|
- and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get("toUserId"), userId)));
|
|
|
- } else {
|
|
|
- and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get("fromUserId"), userId)));
|
|
|
- }
|
|
|
if (ObjectUtils.isNotEmpty(query.get("operation"))){
|
|
|
String operation = (String) query.get("operation");
|
|
|
switch (operation){
|
|
|
case "买入":
|
|
|
- and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get("operation"), "出售")));
|
|
|
- and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get("operation"), "转让")));
|
|
|
- and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get("operation"), "空投")));
|
|
|
+ and.add(criteriaBuilder.or(criteriaBuilder.equal(root.get("operation"), "出售"),criteriaBuilder.equal(root.get("operation"), "转让"),criteriaBuilder.equal(root.get("operation"), "空投")));
|
|
|
+ and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get("toUserId"), userId)));
|
|
|
break;
|
|
|
case "卖出":
|
|
|
and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get("operation"), "转让")));
|
|
|
+ and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get("fromUserId"), userId)));
|
|
|
break;
|
|
|
case "转赠":
|
|
|
and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get("operation"), "转赠")));
|
|
|
+ and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get("fromUserId"), userId)));
|
|
|
break;
|
|
|
}
|
|
|
}
|
liaijie