chore: fixe

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushBlacklistController.java

@@ -2,12 +2,17 @@ package com.cloud.kicc.commonbiz.controller;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.core.constant.AppConstants;
 import com.cloud.kicc.common.security.util.SecurityUtils;
 import com.cloud.kicc.commonbiz.api.entity.PushBlacklist;
+import com.cloud.kicc.commonbiz.api.entity.PushConcernFan;
+import com.cloud.kicc.commonbiz.api.entity.PushConcernFanType;
 import com.cloud.kicc.commonbiz.service.IPushBlacklistService;
+import com.cloud.kicc.commonbiz.service.IPushConcernFanService;
+import com.cloud.kicc.commonbiz.service.IPushConcernFanTypeService;
 import com.cloud.kicc.system.api.entity.User;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -33,6 +38,8 @@ import java.util.Map;
 public class PushBlacklistController {
 
     private final IPushBlacklistService iPushBlacklistService;
+    private final IPushConcernFanService iPushConcernFanService;
+    private final IPushConcernFanTypeService iPushConcernFanTypeService;
 
     @ApiOperation("分页查询")
     @GetMapping("/list")
@@ -51,6 +58,20 @@ public class PushBlacklistController {
     @ApiOperation("保存")
     @PostMapping("/save")
     public R save(@Valid @RequestBody PushBlacklist pushBlacklist) {
+        // Unbind ConcernFan
+        iPushConcernFanService.remove(Wrappers.<PushConcernFan>lambdaQuery()
+                .and(qw -> qw
+                        .eq(PushConcernFan::getConcernUserId, pushBlacklist.getConcernUserId())
+                        .eq(PushConcernFan::getFanUserId, pushBlacklist.getFanUserId())
+                )
+                .or(qw -> qw
+                        .eq(PushConcernFan::getConcernUserId, pushBlacklist.getFanUserId())
+                        .eq(PushConcernFan::getFanUserId, pushBlacklist.getConcernUserId())
+                ));
+        iPushConcernFanTypeService.remove(Wrappers.<PushConcernFanType>lambdaQuery()
+                .eq(PushConcernFanType::getConcernFanId, pushBlacklist.getConcernUserId())
+                .or()
+                .eq(PushConcernFanType::getConcernFanId, pushBlacklist.getFanUserId()));
         iPushBlacklistService.save(pushBlacklist);
         return R.ok();
     }