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/HuiminAgreementController.java | 10 ++++++++-- 1 files changed, 8 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..e51555f 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>() @@ -73,6 +76,9 @@ if (tHuiminAgreement.getObjectType().equals(2) || tHuiminAgreement.getObjectType().equals(1) && Objects.isNull(operatorId)) { if (tHuiminAgreement.getObjectType().equals(1)) { tHuiminAgreement.setOperatorId(null); + boolean remove = huiminAgreementService.remove(new LambdaQueryWrapper<THuiminAgreement>() + .isNull(THuiminAgreement::getOperatorId)); + } huiminAgreementService.saveOrUpdate(tHuiminAgreement); //删除之前的协议配置 -- Gitblit v1.7.1