From 4b527a8d5c6bb3afe2b8f63a0937d324317f8ce0 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Mon, 7 Mar 2022 10:29:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE-=E5=B1=9E=E6=80=A7=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/tag/controller/OnlCgformTagController.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java
index 36eadfdcb..a84af5514 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java
@@ -76,12 +76,12 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 		}
 		//中英切换-属性类型列
 		List<Map<String, Object>> pageList = onlCgformTagService.selectPageInfo(page, queryWrapper);
+		JSONArray jsonArray = new JSONArray();
+		jsonArray.addAll(pageList);
+		List<OnlCgformTag> list = jsonArray.toJavaList(OnlCgformTag.class);
 		if (CutEnum.CN.getValue().equals(cut)) {
-			return Result.OK(pageList);
+			return Result.OK(list);
 		} else {
-			JSONArray jsonArray = new JSONArray();
-			jsonArray.addAll(pageList);
-			List<OnlCgformTag> list = jsonArray.toJavaList(OnlCgformTag.class);
 			list.stream().forEach(f -> f.setFieldShowType(f.getFieldShowTypeEnName()));
 			list.stream().forEach(s->s.setShowArea(s.getShowAreaEnName()));