|
@@ -70,7 +70,10 @@ public class AdsOrderDetailService implements IAdsOrderDetailService {
|
|
|
cri.where().andEquals("username", dto.getUsername());
|
|
|
}
|
|
|
if (StringUtils.isNotBlank(dto.getServerName())) {
|
|
|
- cri.where().andEquals("source_server_name", dto.getServerName());
|
|
|
+ cri.where().andEquals("server_name", dto.getServerName());
|
|
|
+ }
|
|
|
+ if (StringUtils.isNotBlank(dto.getSourceServerName())) {
|
|
|
+ cri.where().andEquals("source_server_name", dto.getSourceServerName());
|
|
|
}
|
|
|
if (gameIds != null) {
|
|
|
cri.where().andInList("order_game_id", gameIds);
|
|
@@ -192,7 +195,10 @@ public class AdsOrderDetailService implements IAdsOrderDetailService {
|
|
|
cri.where().andEquals("username", dto.getUsername());
|
|
|
}
|
|
|
if (StringUtils.isNotBlank(dto.getServerName())) {
|
|
|
- cri.where().andEquals("source_server_name", dto.getServerName());
|
|
|
+ cri.where().andEquals("server_name", dto.getServerName());
|
|
|
+ }
|
|
|
+ if (StringUtils.isNotBlank(dto.getSourceServerName())) {
|
|
|
+ cri.where().andEquals("source_server_name", dto.getSourceServerName());
|
|
|
}
|
|
|
if (gameIds != null) {
|
|
|
cri.where().andInList("order_game_id", gameIds);
|