Merge branch 'dev' of GameCenter/game-center into master

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/RoleManageServiceImpl.java

@@ -1302,17 +1302,17 @@ public class RoleManageServiceImpl implements IRoleManageService {
     private Criteria getSqlByQuery(RoleGameCountryParamDTO dto) {
         Criteria cri = Cnd.cri();
         if (StringUtils.isNotEmpty(dto.getCountry())) {
-            cri.where().andEquals("country", dto.getCountry());
+            cri.where().andEquals("a.country", dto.getCountry());
         }
         if (StringUtils.isNotEmpty(dto.getServerId())) {
-            cri.where().andEquals("server_id", dto.getServerId());
+            cri.where().andEquals("a.server_id", dto.getServerId());
         }
-        cri.where().andInList("game_id", Arrays.asList(35L, 36L, 10035L));
+        cri.where().andInList("a.game_id", Arrays.asList(35L, 36L, 10035L));
         if (dto.getCountryLevel() != null && dto.getCountryLevel() == 0) {
-            cri.where().andLTE("role_level", 13);
+            cri.where().andLTE("a.role_level", 13);
         }
         if (dto.getCountryLevel() != null && dto.getCountryLevel() == 1) {
-            cri.where().andGT("role_level", 13);
+            cri.where().andGT("a.role_level", 13);
         }
         return cri;
     }