From b6373daa40c3dc17ca107f3666fd252f3b6b0778 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 03 一月 2025 18:34:52 +0800
Subject: [PATCH] 代码
---
ruoyi-system/src/main/resources/mapper/system/TIndexMenuMapper.xml | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TConsultationController.java | 4 ++++
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TConsultationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TConsultationController.java
index 1b15c7c..21b28ea 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TConsultationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TConsultationController.java
@@ -15,6 +15,7 @@
import com.ruoyi.web.controller.query.ConsultationQuery;
import com.ruoyi.web.controller.query.InformationQuery;
import io.swagger.annotations.ApiOperation;
+import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -183,6 +184,9 @@
}
List<TConsultation> records = page.getRecords();
+ if(CollectionUtils.isEmpty(records)){
+ return R.ok(new Page<>());
+ }
Set<Long> cacheSet = redisCache.getCacheSet("Consultation:" + userId);
List<Integer> regionIds = records.stream().map(TConsultation::getRegionId).collect(Collectors.toList());
diff --git a/ruoyi-system/src/main/resources/mapper/system/TIndexMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TIndexMenuMapper.xml
index 16c8d56..aacc857 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TIndexMenuMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TIndexMenuMapper.xml
@@ -38,7 +38,7 @@
FROM t_technical_title tt
WHERE 1=1 and tt.is_delete = 0
<if test="cityCode != null and cityCode.size() > 0">
- <foreach collection="cityCode" item="id" separator=",">
+ <foreach collection="cityCode" item="id" >
and FIND_IN_SET(#{id}, tt.region_ids)
</foreach>
</if>
--
Gitblit v1.7.1