Merge remote-tracking branch 'origin/package' into package

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

@@ -111,5 +111,5 @@ public interface IRoleManageService {
      */
     List<Map> roleDetailList(RoleIpInfoParamDTO dto);
 
-    List<Map> roleDetailList(List<Long> roleId,RoleIpInfoParamDTO roleIpInfoParamDTO);
+    List<Map> roleDetailList(List<String> roleId,RoleIpInfoParamDTO roleIpInfoParamDTO);
 }

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

@@ -1183,13 +1183,13 @@ public class RoleManageServiceImpl implements IRoleManageService {
         if (dto.getExcludeUserType() == 1) {
             roleIdStr = roleIdStr.replaceAll("[\\[\\]\"]", "");
         }
-        return baseService.roleDetailList(Arrays.stream(roleIdStr.split(",")).map(String::trim).map(Long::valueOf).collect(Collectors.toList()), dto);
+        return baseService.roleDetailList(Arrays.stream(roleIdStr.split(",")).map(String::trim).collect(Collectors.toList()), dto);
     }
 
     @Override
-    public List<Map> roleDetailList(List<Long> roleId, RoleIpInfoParamDTO roleIpInfoParamDTO) {
+    public List<Map> roleDetailList(List<String> roleId, RoleIpInfoParamDTO roleIpInfoParamDTO) {
         Criteria criteria = Cnd.cri();
-        criteria.where().andInList("role_id", roleId);
+        criteria.where().andInStrList("role_id", roleId);
         String roleDetailListSql = getRoleDetailList(criteria);
         Sql sql = Sqls.create(roleDetailListSql);
         sql.setCallback(Sqls.callback.maps());