fix 雷达链接列表

netflix-service/src/main/java/com/cyksj/service/corp/impl/CorpFollowServiceImpl.java

@@ -8,10 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cyksj.common.constant.Constant;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.common.util.Jsons;
-import com.cyksj.mapper.corp.CorpFollowActiveCodeMapper;
-import com.cyksj.mapper.corp.CorpFollowDutyRelateMapper;
-import com.cyksj.mapper.corp.CorpFollowServiceRelateMapper;
-import com.cyksj.mapper.corp.CorpTagMapper;
+import com.cyksj.mapper.corp.*;
 import com.cyksj.model.dto.YhServiceDto;
 import com.cyksj.model.entity.*;
 import com.cyksj.model.request.corp.Attachments;
@@ -52,6 +49,8 @@ public class CorpFollowServiceImpl implements CorpFollowService {
 
 	private final CorpTagMapper corpTagMapper;
 
+	private final CorpTagGroupMapper corpTagGroupMapper;
+
 	private final RedisService redisService;
 
 	@Override
@@ -172,6 +171,11 @@ public class CorpFollowServiceImpl implements CorpFollowService {
 				.eq(CorpTag::getName, corpFollowActiveCode.getMarkTag()).last("limit 1"));
 		if (corpTag != null) {
 			wxCorpOps.delCorpTag(new String[]{corpTag.getTagId()}, null);
+			//删除标签
+			corpTagMapper.deleteById(corpTag.getId());
+			//删除标签组
+			corpTagGroupMapper.delete(Wrappers.lambdaQuery(CorpTagGroup.class)
+					.eq(CorpTagGroup::getGroupId, corpTag.getGroupId()));
 		}
 	}
 

netflix-web/src/main/java/com/cyksj/web/controller/manage/corp/CorpInteractiveRadarController.java

@@ -2,7 +2,6 @@ package com.cyksj.web.controller.manage.corp;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.common.util.Jsons;
 import com.cyksj.dto.Result;
@@ -81,24 +80,23 @@ public class CorpInteractiveRadarController {
 		search.getDataList().forEach(data -> {
 			if (data.getType() == 1) {
 				String linkInfoStr = data.getLinkInfoStr();
-				if (StrUtil.isNotBlank(linkInfoStr)) {
-					try {
-						CorpInteractiveReaderLink linkInfo = Jsons.parseObject(linkInfoStr, CorpInteractiveReaderLink.class);
-						data.setLinkInfo(linkInfo);
-					} catch (Exception e) {
-					}
+				try {
+					CorpInteractiveReaderLink linkInfo = Jsons.parseObject(linkInfoStr, CorpInteractiveReaderLink.class);
+					data.setLinkInfo(linkInfo);
+				} catch (Exception e) {
 				}
-				Map<String, Long> map = corpInteractiveRadarUserRecordMapper.selectClickRecord(data.getId());
-				Integer clickNum = map.get("clickNum").intValue();
-				data.setClickNum(clickNum);
-				Integer clickUserNum = map.get("clickUserNum").intValue();
-				data.setClickUserNum(clickUserNum);
-
-				CorpInteractiveReaderOrderDetailView detailView = beanSearcher.searchFirst(CorpInteractiveReaderOrderDetailView.class, MapUtils.builder().put("id", String.format("id = %s", data.getId())).build());
-				data.setPayNum(detailView.getTotal());
-				data.setPayNewUserNum(detailView.getNumOfNewUser());
-				data.setPayOldUserNum(detailView.getNumOfOldUser());
 			}
+
+			Map<String, Long> map = corpInteractiveRadarUserRecordMapper.selectClickRecord(data.getId());
+			Integer clickNum = map.get("clickNum").intValue();
+			data.setClickNum(clickNum);
+			Integer clickUserNum = map.get("clickUserNum").intValue();
+			data.setClickUserNum(clickUserNum);
+
+			CorpInteractiveReaderOrderDetailView detailView = beanSearcher.searchFirst(CorpInteractiveReaderOrderDetailView.class, MapUtils.builder().put("id", String.format("id = %s", data.getId())).build());
+			data.setPayNum(detailView.getTotal());
+			data.setPayNewUserNum(detailView.getNumOfNewUser());
+			data.setPayOldUserNum(detailView.getNumOfOldUser());
 		});
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
 	}