查询标签接口修改按照新增时间降序排序

src/main/java/com/keymobile/tagmanager/service/TagService.java

@@ -199,6 +199,7 @@ public class TagService {
 		if (StringUtils.isNotBlank(keyword) && !"*".equals(keyword)) {
 			andCriterias.andOperator(createKeywordRegexQuery(Arrays.asList("name", "nameEn", "desc"), keyword));
 		}
+		
 		Query q = createPageQuery(page, andCriterias);
 		List<Tag> tags = mongoOperations.find(q, Tag.class);
 		long count = mongoOperations.count(q, Tag.class);
@@ -228,9 +229,8 @@ public class TagService {
 		if (StringUtils.isNotBlank(keyword) && !"*".equals(keyword)) {
 			andCriterias.andOperator(createKeywordRegexQuery(Arrays.asList("name", "nameEn", "desc"), keyword));
 		}
-		Query q = new Query(andCriterias);
-		q.skip(page.getOffset());
-	    q.limit(page.getPageSize());
+		Query q = createPageQuery(page, andCriterias);
+		
 		List<Tag> tags = mongoOperations.find(q, Tag.class);
 		long count = mongoOperations.count(q, Tag.class);
 		page.setData(decoratorToExtTag(tags, userName));
@@ -348,11 +348,20 @@ public class TagService {
 		dirs.add(parentTag);
 		return dirs;
 	}
-	//拼接默认配许条件
+	//拼接默认排序条件
 	private List<Order> getDefaultTagOrders() {
 		List<Order> orders = new ArrayList<>();
 		orders.add(new Order(Direction.ASC, "level"));
 		orders.add(new Order(Direction.DESC, "order"));
+		//添加日期降序排序
+		orders.add(new Order(Direction.DESC, "createDate"));
+		return orders;
+	}
+	//拼接查询数据按照创建日期排序条件
+	private List<Order> getCreateDataTagOrders(){
+		List<Order> orders = new ArrayList<>();
+		//添加日期降序排序
+		orders.add(new Order(Direction.DESC, "createDate"));
 		return orders;
 	}
 	//拼接查找个人标签条件
@@ -418,7 +427,7 @@ public class TagService {
 		Query q = new Query(andCriterias);
 		q.skip(page.getOffset());
 	    q.limit(page.getPageSize());
-	    q.with(Sort.by(getDefaultTagOrders()));
+	    q.with(Sort.by(this.getCreateDataTagOrders()));
 		return q;
 	}
 	//根据用户id标识该标签能否被操作