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

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

@@ -90,7 +90,7 @@ public interface IRoleManageService {
 
     List<Map> ipDetailList(RoleIpInfoParamDTO dto);
 
-    List<Map> ipCountList(List<String> ip);
+    List<Map> ipCountList(List<String> ip,String roleId);
 
     /**
      * 查询玩家详情列表

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

@@ -1090,7 +1090,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
         if (StringUtils.isEmpty(ipCountIp)) {
             return new ArrayList<>();
         }
-        return baseService.ipCountList(Arrays.stream(ipCountIp.split(",")).map(String::trim).collect(Collectors.toList()));
+        return baseService.ipCountList(Arrays.stream(ipCountIp.split(",")).map(String::trim).collect(Collectors.toList()),dto.getRoleId());
     }
 
     @Override
@@ -1108,7 +1108,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
     }
 
     @Override
-    public List<Map> ipCountList(List<String> ip) {
+    public List<Map> ipCountList(List<String> ip,String roleId) {
         Criteria criteria = Cnd.cri();
         criteria.where().andInStrList("a.ip", ip);
         criteria.where().andNotIsNull("a.ip");
@@ -1117,6 +1117,10 @@ public class RoleManageServiceImpl implements IRoleManageService {
         criteria.where().andNotIsNull("a.role_id");
         criteria.where().andNotEquals("a.role_id", "null");
         criteria.where().andNotEquals("a.role_id", "");
+        criteria.where().andNotEquals("a.role_id", "");
+        if(roleId!=null){
+            criteria.where().andEquals("b.role_id", roleId);
+        }
         String ipCountList = getIpCountList(criteria);
         Sql sql = Sqls.create(ipCountList);
         sql.setCallback(Sqls.callback.maps());