From 3c8dc107047c0b5ee407fa36ca2ce06090f75929 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 12 四月 2025 18:05:02 +0800
Subject: [PATCH] bug修改
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java
index 2115a99..c69fdf1 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java
@@ -221,7 +221,16 @@
.eq(THuiminAgreementSetting::getAgreementId, huiminAgreement.getId()));
huiminCard.setAgreementSettings(list);
}else {
- huiminCard.setAgreementSettings(new ArrayList<>());
+ THuiminAgreement huiminAgreement1 = huiminAgreementService.getOne(new LambdaQueryWrapper<THuiminAgreement>()
+ .isNull(THuiminAgreement::getOperatorId));
+ if (huiminAgreement1!=null){
+ List<THuiminAgreementSetting> list = huiminAgreementSettingService.list(new LambdaQueryWrapper<THuiminAgreementSetting>()
+ .eq(THuiminAgreementSetting::getAgreementId, huiminAgreement1.getId()));
+ huiminCard.setAgreementSettings(list);
+ }else {
+ huiminCard.setAgreementSettings(new ArrayList<>());
+
+ }
}
}
}else{
@@ -273,7 +282,15 @@
}else{
THuiminAgreement one = huiminAgreementService.getOne(new LambdaQueryWrapper<THuiminAgreement>()
.eq(THuiminAgreement::getOperatorId,store.getOperatorId()).last("limit 1"));
- huiminAgreementVO.setIntroduce(one.getStoreNoHuiminCardIntro());
+ if (one == null){
+ THuiminAgreement two = huiminAgreementService.getOne(new LambdaQueryWrapper<THuiminAgreement>()
+ .isNull(THuiminAgreement::getOperatorId).last("limit 1"));
+ huiminAgreementVO.setIntroduce(two.getStoreNoHuiminCardIntro());
+
+ }else{
+ huiminAgreementVO.setIntroduce(one.getStoreNoHuiminCardIntro());
+
+ }
}
--
Gitblit v1.7.1