From a567c82ef2f963234021ed2713f37ac917d16dcc Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Thu, 5 Jun 2025 13:04:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0JsonFormat=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E9=98=B2=E6=AD=A2=E5=87=BA=E7=8E=B0=E7=B1=BB=E5=9E=8B=E8=BD=AC?=
 =?UTF-8?q?=E6=8D=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jeesite/common/mapper/JsonMapper.java | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java b/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java
index d439d0a5..c3ad30ef 100644
--- a/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java
+++ b/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java
@@ -116,13 +116,12 @@ public class JsonMapper extends ObjectMapper {
 			@Override
 			public Object findSerializer(Annotated a) {
 				if (a instanceof AnnotatedMethod) {
-					AnnotatedElement m = a.getAnnotated();
-					JsonFormat jf = m.getAnnotation(JsonFormat.class);
-					if (jf != null && StringUtils.containsAnyIgnoreCase(jf.pattern(), pattern)) {
-						return new JeeSiteJsonSerializer(jf.pattern());
-					}
 					AnnotatedMethod am = (AnnotatedMethod) a;
 					if (am.getRawReturnType() == Date.class) {
+						JsonFormat jf = am.getAnnotation(JsonFormat.class);
+						if (jf != null && StringUtils.containsAnyIgnoreCase(jf.pattern(), pattern)) {
+							return new JeeSiteJsonSerializer(jf.pattern());
+						}
 						return new JeeSiteJsonSerializer(null);
 					}
 				} else if (a instanceof AnnotatedClass) {
@@ -135,13 +134,13 @@ public class JsonMapper extends ObjectMapper {
 			@Override
 			public Object findDeserializer(Annotated a) {
 				if (a instanceof AnnotatedMethod) {
-					AnnotatedElement m = a.getAnnotated();
-					JsonFormat jf = m.getAnnotation(JsonFormat.class);
-					if (jf != null && StringUtils.containsAnyIgnoreCase(jf.pattern(), pattern)) {
-						return new JeeSiteJsonDeserializer(jf.pattern());
-					}
 					AnnotatedMethod am = (AnnotatedMethod) a;
 					if (am.getParameterCount() > 0 && am.getParameterType(0).getRawClass() == Date.class) {
+						AnnotatedElement m = am.getAnnotated();
+						JsonFormat jf = m.getAnnotation(JsonFormat.class);
+						if (jf != null && StringUtils.containsAnyIgnoreCase(jf.pattern(), pattern)) {
+							return new JeeSiteJsonDeserializer(jf.pattern());
+						}
 						return new JeeSiteJsonDeserializer(null);
 					}
 				} else if (a instanceof AnnotatedClass) {