diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushConcernFanController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushConcernFanController.java index 2f63233c..73dd3bf5 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushConcernFanController.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushConcernFanController.java @@ -6,7 +6,6 @@ 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.annotation.Inner; import com.cloud.kicc.commonbiz.api.entity.*; import com.cloud.kicc.commonbiz.api.enums.PushAuditStatusEnum; import com.cloud.kicc.commonbiz.api.enums.PushConcernTypeEnum; @@ -18,10 +17,7 @@ import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; /** @@ -87,7 +83,7 @@ public class PushConcernFanController { .eq(PushConcernFanType::getFanUserId, pushConcernFan.getFanUserId())); iPushConcernFanService.save(pushConcernFan); // 同步推送类型 - if (pushConcernFan.getStatus() == PushAuditStatusEnum.APPROVED.getValue()) { + if (Objects.equals(pushConcernFan.getStatus(), PushAuditStatusEnum.APPROVED.getValue())) { List pushTypes = iPushTypeService.list(Wrappers.lambdaQuery().eq(PushType::getCreateById, pushConcernFan.getConcernUserId())); List pushConcernFanTypes = pushTypes.stream().map(item -> new PushConcernFanType() .setName(item.getName()) @@ -170,7 +166,7 @@ public class PushConcernFanController { iPushConcernFanService.update(Wrappers.lambdaUpdate() .set(PushConcernFan::getStatus, status).eq(PushConcernFan::getId, id)); // 同步推送类型 - if (status == PushAuditStatusEnum.APPROVED.getValue()) { + if (Objects.equals(status, PushAuditStatusEnum.APPROVED.getValue())) { PushConcernFan pushConcernFan = iPushConcernFanService.getById(id); // 考虑:先删除数据在新增,防止安卓不做限制能多次关注导致脏数据 iPushConcernFanTypeService.remove(Wrappers.lambdaQuery()