From 2b326b025aa0121abe008c3e7072c39a0dc286db Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 10 十一月 2026 13:59:38 +0800
Subject: [PATCH] 合并修改com/ruoyi/quartz/task/RyTacom/ruoyi/quartz/task/RyTask.java:3sk.java:3com/ruoyi/quart/task/RyTask.java:3

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
index 8cea226..6a19f59 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -1,6 +1,6 @@
 package com.ruoyi.web.controller.smartor;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.util.TypeUtils;
 import com.github.pagehelper.ISelect;
 import com.ruoyi.common.annotation.AddOrgId;
 import com.ruoyi.common.annotation.Log;
@@ -1078,7 +1078,9 @@
             Map<String, Object> redisMap = redisCache.getCacheObject(userId + "patItemCount");
             Boolean redisFlag = false;
             if (MapUtils.isNotEmpty(redisMap)) {
-                ServiceSubtaskEntity oldCondition = (ServiceSubtaskEntity) redisMap.get("searchCondition");
+                // Redis 鍙嶅簭鍒楀寲鍚庯紝searchCondition 鍙兘鏄� JSONObject锛岀洿鎺ュ己杞細瑙﹀彂 ClassCastException锛岃繖閲岀粺涓�杞崲
+                Object cachedCondition = redisMap.get("searchCondition");
+                ServiceSubtaskEntity oldCondition = TypeUtils.cast(cachedCondition, ServiceSubtaskEntity.class);
                 if (ObjectUtils.isNotEmpty(oldCondition) && isSameCondition(oldCondition, serviceSubtaskEntity)) {
                     redisFlag = true;
                     map = redisMap;

--
Gitblit v1.9.3