From 9e5672c40509208ccbb82ba7fc130b3fa68af80c Mon Sep 17 00:00:00 2001
From: Aoi_Tori <2547614904@qq.com>
Date: Thu, 19 Jun 2025 17:02:12 +0800
Subject: [PATCH] 2025/6/19

---
 .../modules/sift/utils/QueryUserSettingUtils.java   | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/spring/modules/sift/utils/QueryUserSettingUtils.java b/src/main/java/com/spring/modules/sift/utils/QueryUserSettingUtils.java
index 237d46ef..764ba9fa 100644
--- a/src/main/java/com/spring/modules/sift/utils/QueryUserSettingUtils.java
+++ b/src/main/java/com/spring/modules/sift/utils/QueryUserSettingUtils.java
@@ -33,6 +33,9 @@ public class QueryUserSettingUtils {
         if (list.isEmpty()){
             throw new RuntimeException("参数列表为空");
         }
+        if (querySavedVo.getUserId() == null) {
+            throw new RuntimeException("querySavedVo用户ID为空");
+        }
         // 2、判断是否存在上一次修改
         List<QuerySavedHeader> querySavedHeaders = querySavedHeaderService.lambdaQuery()
                 .eq(QuerySavedHeader::getMenuId, querySavedVo.getMenuId())
@@ -49,17 +52,23 @@ public class QueryUserSettingUtils {
             querySavedHeader.setItemDesc("上一次查询");
             querySavedHeaderService.save(querySavedHeader);
         }else {
+            if (querySavedHeader.getUserId()==null){
+                throw new RuntimeException("querySavedHeader用户ID为空");
+            }
             querySavedDetailService.lambdaUpdate().
                     eq(QuerySavedDetail::getMenuId,querySavedHeader.getMenuId()).
-                    eq(QuerySavedDetail::getUserId,querySavedVo.getUserId()).
+                    eq(QuerySavedDetail::getUserId,querySavedHeader.getUserId()).
                     eq(QuerySavedDetail::getItemNo,querySavedHeader.getItemNo()).remove();
         }
         // 2-2、新增
         QuerySavedHeader finalQuerySavedHeader = querySavedHeader;
+        if (finalQuerySavedHeader.getUserId()==null){
+            throw new RuntimeException("finalQuerySavedHeader用户ID为空");
+        }
         List<QuerySavedDetail> collect = list.stream().map(queryUserSetting -> {
             QuerySavedDetail detail = new QuerySavedDetail();
             detail.setMenuId(finalQuerySavedHeader.getMenuId());
-            detail.setUserId(querySavedVo.getUserId());
+            detail.setUserId(finalQuerySavedHeader.getUserId());
             detail.setDtsName(finalQuerySavedHeader.getDtsName());
             detail.setItemNo(finalQuerySavedHeader.getItemNo());
             detail.setItemDesc(finalQuerySavedHeader.getItemDesc());