From 2acf043f0518d89b8bb35a5e1044219940b7810a Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 15 Sep 2025 17:59:48 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiNewsController.java | 6 +++++-
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiCmsController.java | 5 +++++
2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiCmsController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiCmsController.java
index 7249e01..637a667 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiCmsController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiCmsController.java
@@ -39,6 +39,11 @@
public Object list(HttpServletRequest request) {
String model = request.getParameter("model");
String language = request.getParameter("language");
+ if(language.equals("cht")){
+ language = "CN";
+ }else if(language.equals("jp")){
+ language = "Japanese";
+ }
List<Cms> cacheListByModel = this.cmsService.getModelAndLanguage(model, language);
for (Cms cms : cacheListByModel) {
cms.setCreateTimeStr(DateUtils.format(cms.getCreateTime(), DateUtils.DF_yyyyMMddHHmmss));
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiNewsController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiNewsController.java
index 9d82eac..02ef6cb 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiNewsController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiNewsController.java
@@ -80,7 +80,11 @@
}
int page_no_int = Integer.valueOf(page_no).intValue();
Page<News> page = new Page<>(1, 1000000);
-// List<News> list = this.newsService.cachePagedQuery(page_no_int, 20, language).getElements();
+ if(language.equals("cht")){
+ language = "CN";
+ }else if(language.equals("jp")){
+ language = "Japanese";
+ }
LambdaQueryWrapper<News> lambdaQueryWrapper = Wrappers.<News>query().lambda().eq(News::getLanguage, language)
.eq(News::isPopUp,false);
lambdaQueryWrapper.orderByDesc(News::getCreateTime);
--
Gitblit v1.9.3