From 2a7f65e57735e09651187265cdca5f78c00f1512 Mon Sep 17 00:00:00 2001
From: xpecya <xpecya@gmail.com>
Date: Sun, 15 Dec 2024 16:57:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=97=B6=E9=97=B4=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/model/vo/admin/user/AdminUserVO.java         |  4 ++--
 .../jinrui/reference/admin/model/vo/login/LoginVO.java |  4 ++--
 .../com/jinrui/reference/core/mapper/NewsMapper.java   | 10 +++++-----
 .../reference/core/model/vo/column/ColumnVO.java       |  4 ++--
 .../jinrui/reference/core/model/vo/news/NewsVO.java    |  6 +++---
 .../com/jinrui/reference/core/model/vo/tag/TagVO.java  |  4 ++--
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/admin/src/main/java/com/jinrui/reference/admin/model/vo/admin/user/AdminUserVO.java b/admin/src/main/java/com/jinrui/reference/admin/model/vo/admin/user/AdminUserVO.java
index 66aa7f8..805a668 100644
--- a/admin/src/main/java/com/jinrui/reference/admin/model/vo/admin/user/AdminUserVO.java
+++ b/admin/src/main/java/com/jinrui/reference/admin/model/vo/admin/user/AdminUserVO.java
@@ -35,13 +35,13 @@ public class AdminUserVO {
     /**
      * 用户创建时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
     /**
      * 用户修改时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
     public AdminUserVO(AdminUser adminUser) {
diff --git a/admin/src/main/java/com/jinrui/reference/admin/model/vo/login/LoginVO.java b/admin/src/main/java/com/jinrui/reference/admin/model/vo/login/LoginVO.java
index 0faecf3..2d30497 100644
--- a/admin/src/main/java/com/jinrui/reference/admin/model/vo/login/LoginVO.java
+++ b/admin/src/main/java/com/jinrui/reference/admin/model/vo/login/LoginVO.java
@@ -35,13 +35,13 @@ public class LoginVO {
     /**
      * 用户创建时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
     /**
      * 用户修改时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
     public LoginVO(AdminUser adminUser) {
diff --git a/core/src/main/java/com/jinrui/reference/core/mapper/NewsMapper.java b/core/src/main/java/com/jinrui/reference/core/mapper/NewsMapper.java
index 5893c4d..e9a7d32 100644
--- a/core/src/main/java/com/jinrui/reference/core/mapper/NewsMapper.java
+++ b/core/src/main/java/com/jinrui/reference/core/mapper/NewsMapper.java
@@ -91,14 +91,14 @@ public interface NewsMapper {
             "news.publish_time as publishTime," +
             "news.update_time as updateTime " +
             "from news " +
-            "<if test=\"column != null\">" +
+            "<if test=\"column != null and !column.isEmpty()\">" +
             "inner join news_column_rel on news.id = news_column_rel.news_id " +
             "</if>" +
             "<where>" +
             "<if test=\"keyword != null and !keyword.isEmpty()\">" +
             "news.title like concat('%', #{keyword}, '%') " +
             "</if>" +
-            "<if test=\"column != null\">" +
+            "<if test=\"column != null and !column.isEmpty()\">" +
             "and news_column_rel.column_id in (${column}) " +
             "</if>" +
             "<if test=\"status != null\">" +
@@ -108,7 +108,7 @@ public interface NewsMapper {
             "and news.id &gt; #{last}" +
             "</if>" +
             "</where>" +
-            "order by concat('`', ${orderBy}, '`') " +
+            "order by news.${orderBy} " +
             "<if test=\"'desc'.equals(direction)\">" +
             "desc" +
             "</if>" +
@@ -125,14 +125,14 @@ public interface NewsMapper {
 
     @Select("<script>" +
             "select count(*) from (select distinct news.* from news " +
-            "<if test=\"column != null\">" +
+            "<if test=\"column != null and !column.isEmpty() \">" +
             "inner join news_column_rel on news.id = news_column_rel.news_id " +
             "</if>" +
             "<where>" +
             "<if test=\"keyword != null and !keyword.isEmpty()\">" +
             "news.title like concat('%', #{keyword}, '%') " +
             "</if>" +
-            "<if test=\"column != null\">" +
+            "<if test=\"column != null and !column.isEmpty()\">" +
             "and news_column_rel.column_id in (${column}) " +
             "</if>" +
             "<if test=\"status != null\">" +
diff --git a/core/src/main/java/com/jinrui/reference/core/model/vo/column/ColumnVO.java b/core/src/main/java/com/jinrui/reference/core/model/vo/column/ColumnVO.java
index b22715b..575155b 100644
--- a/core/src/main/java/com/jinrui/reference/core/model/vo/column/ColumnVO.java
+++ b/core/src/main/java/com/jinrui/reference/core/model/vo/column/ColumnVO.java
@@ -31,13 +31,13 @@ public class ColumnVO {
     /**
      * 创建时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
     /**
      * 修改时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
     /**
diff --git a/core/src/main/java/com/jinrui/reference/core/model/vo/news/NewsVO.java b/core/src/main/java/com/jinrui/reference/core/model/vo/news/NewsVO.java
index 8417263..97b64ff 100644
--- a/core/src/main/java/com/jinrui/reference/core/model/vo/news/NewsVO.java
+++ b/core/src/main/java/com/jinrui/reference/core/model/vo/news/NewsVO.java
@@ -37,19 +37,19 @@ public class NewsVO {
     /**
      * 创建时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
     /**
      * 发布时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date publishTime;
 
     /**
      * 修改时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
     public NewsVO(News news) {
diff --git a/core/src/main/java/com/jinrui/reference/core/model/vo/tag/TagVO.java b/core/src/main/java/com/jinrui/reference/core/model/vo/tag/TagVO.java
index d0020e2..c44c31f 100644
--- a/core/src/main/java/com/jinrui/reference/core/model/vo/tag/TagVO.java
+++ b/core/src/main/java/com/jinrui/reference/core/model/vo/tag/TagVO.java
@@ -26,13 +26,13 @@ public class TagVO {
     /**
      * 创建时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
     /**
      * 修改时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
     /**