From 8afc5bfc1e5df1e2f0a8872a344da3b3fd5d63b9 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 11 四月 2025 20:24:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminAgreementController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminAgreementController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminAgreementController.java
index 9ce9182..34f362a 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminAgreementController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminAgreementController.java
@@ -41,11 +41,14 @@
@PostMapping("/base/tHuiminAgreement/selectByObjectType")
public THuiminAgreement selectByObjectType(@RequestBody HuiminAgreementQuery query) {
THuiminAgreement huiminAgreement = null;
- if (query.getObjectType().equals(1)) {
+ if (query.getObjectType().equals(1) && Objects.isNull(query.getOperatorId())) {
//平台
huiminAgreement = huiminAgreementService.getOne(new LambdaQueryWrapper<THuiminAgreement>()
.isNull(THuiminAgreement::getOperatorId));
-
+ }else if (query.getObjectType().equals(1) && Objects.nonNull(query.getOperatorId())){
+ //平台
+ huiminAgreement = huiminAgreementService.getOne(new LambdaQueryWrapper<THuiminAgreement>()
+ .eq(THuiminAgreement::getOperatorId, query.getOperatorId()));
}else if (query.getObjectType().equals(2)) {
//运营商
huiminAgreement = huiminAgreementService.getOne(new LambdaQueryWrapper<THuiminAgreement>()
--
Gitblit v1.7.1