修改分页查询
This commit is contained in:
parent
c62d20f63d
commit
f9cf9ad312
|
@ -995,9 +995,9 @@ public class ModelsServiceImpl implements ModelsService {
|
||||||
|
|
||||||
if (map != null) {
|
if (map != null) {
|
||||||
List<Map<String, Object>> topics = (List<Map<String, Object>>) map.get("topics");
|
List<Map<String, Object>> topics = (List<Map<String, Object>>) map.get("topics");
|
||||||
if (topics != null && topics.size() > 0 && modelTopic.equals(topics.get(0).get("name"))) {
|
if (topics != null && topics.size() > 0 && modelTopic.equals(topics.get(1).get("name"))) {
|
||||||
String modeltag = (String) topics.get(1).get("name");
|
String modeltag = (String) topics.get(2).get("name");
|
||||||
String modeltype = (String) topics.get(2).get("name");
|
String modeltype = (String) topics.get(3).get("name");
|
||||||
modeltag = modeltag.substring("modeltag-".length());
|
modeltag = modeltag.substring("modeltag-".length());
|
||||||
modeltype = modeltype.substring("modeltype-".length());
|
modeltype = modeltype.substring("modeltype-".length());
|
||||||
if (StringUtils.isNotEmpty(modelTagName) && !modelTagName.toLowerCase().equals(modeltag)) {
|
if (StringUtils.isNotEmpty(modelTagName) && !modelTagName.toLowerCase().equals(modeltag)) {
|
||||||
|
|
|
@ -448,9 +448,9 @@ public class NewDatasetServiceImpl implements NewDatasetService {
|
||||||
|
|
||||||
if (map != null) {
|
if (map != null) {
|
||||||
List<Map<String, Object>> topics = (List<Map<String, Object>>) map.get("topics");
|
List<Map<String, Object>> topics = (List<Map<String, Object>>) map.get("topics");
|
||||||
if (topics != null && topics.size() > 0 && datasetTopic.equals(topics.get(0).get("name"))) {
|
if (topics != null && topics.size() > 0 && datasetTopic.equals(topics.get(1).get("name"))) {
|
||||||
String datasettag = (String) topics.get(1).get("name");
|
String datasettag = (String) topics.get(2).get("name");
|
||||||
String datasetype = (String) topics.get(2).get("name");
|
String datasetype = (String) topics.get(3).get("name");
|
||||||
datasettag = datasettag.substring("datatag-".length());
|
datasettag = datasettag.substring("datatag-".length());
|
||||||
datasetype = datasetype.substring("datatype-".length());
|
datasetype = datasetype.substring("datatype-".length());
|
||||||
if (StringUtils.isNotEmpty(datasetTagName) && !datasetTagName.toLowerCase().equals(datasettag)) {
|
if (StringUtils.isNotEmpty(datasetTagName) && !datasetTagName.toLowerCase().equals(datasettag)) {
|
||||||
|
|
Loading…
Reference in New Issue