|
@@ -1047,19 +1047,26 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public List<String> gameCountryList() {
|
|
|
- String countryListSql = getCountryListSql();
|
|
|
+ public List<Map> gameCountryList(GameCountryParamDTO dto) {
|
|
|
+ Criteria cri = Cnd.cri();
|
|
|
+ if(CollectionUtils.isNotEmpty(dto.getServerId())){
|
|
|
+ cri.where().andInStrList("server_id",dto.getServerId());
|
|
|
+ }
|
|
|
+ if(CollectionUtils.isNotEmpty(dto.getGameId())){
|
|
|
+ cri.where().andInList("parent_game_id",dto.getGameId());
|
|
|
+ }
|
|
|
+ String countryListSql = getCountryListSql(cri);
|
|
|
Sql sql = Sqls.create(countryListSql);
|
|
|
- sql.setCallback(Sqls.callback.strList());
|
|
|
+ sql.setCallback(Sqls.callback.maps());
|
|
|
dao.execute(sql);
|
|
|
- List<String> list = sql.getList(String.class);
|
|
|
+ List<Map> list = sql.getList(Map.class);
|
|
|
return list;
|
|
|
}
|
|
|
|
|
|
- private String getCountryListSql() {
|
|
|
+ private String getCountryListSql(Criteria criteria) {
|
|
|
return """
|
|
|
- select country from dm_game_order.t_server_country
|
|
|
- """;
|
|
|
+ select country,server_id from dm_game_order.t_server_country
|
|
|
+ """ + criteria;
|
|
|
}
|
|
|
|
|
|
private String getGameCountryRoleListSql(Criteria criA) {
|