标签-属性不一致修改
This commit is contained in:
+4
-4
@@ -76,12 +76,12 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
|
|||||||
}
|
}
|
||||||
//中英切换-属性类型列
|
//中英切换-属性类型列
|
||||||
List<Map<String, Object>> pageList = onlCgformTagService.selectPageInfo(page, queryWrapper);
|
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)) {
|
if (CutEnum.CN.getValue().equals(cut)) {
|
||||||
return Result.OK(pageList);
|
return Result.OK(list);
|
||||||
} else {
|
} 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(f -> f.setFieldShowType(f.getFieldShowTypeEnName()));
|
||||||
list.stream().forEach(s->s.setShowArea(s.getShowAreaEnName()));
|
list.stream().forEach(s->s.setShowArea(s.getShowAreaEnName()));
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user