fix

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

@@ -196,6 +196,8 @@ public class CorpKfServiceImpl implements CorpKfService {
 		corpKfFollowChangeRecord.setBackValue(Jsons.toJson(after));
 		corpKfFollowChangeRecord.setOperator(operator);
 		StringBuilder changeStr = new StringBuilder();
+		StringBuilder addChangeStr = new StringBuilder();
+		StringBuilder subChangStr = new StringBuilder();
 
 		List<SysCorpFollowView> sysCorpFollowViews = beanSearcher.searchAll(SysCorpFollowView.class, MapUtils.builder().build());
 		Map<String, List<SysCorpFollowView>> followMap = sysCorpFollowViews.stream().collect(Collectors.groupingBy(SysCorpFollowView::getFollowId));
@@ -207,12 +209,12 @@ public class CorpKfServiceImpl implements CorpKfService {
 			List<CorpKfAccountFollow> afCorpKfAccountFollows = afDutyWeekFollowMap.get(bfDutyWeek);
 			if (CollUtil.isEmpty(afCorpKfAccountFollows)) {
 				changeStr.append(getDutyWeekName(bfDutyWeek));
-				changeStr.append("移除");
+				subChangStr.append("移除");
 				List<String> bfFollowIds = Jsons.parseList(bfCorpKfAccountFollow.getUserIdList(), String.class);
 				for (int i1 = 0; i1 < bfFollowIds.size(); i1++) {
-					changeStr.append(followMap.get(bfFollowIds.get(0)).get(0).getName());
+					subChangStr.append(followMap.get(bfFollowIds.get(0)).get(0).getName());
 					if (i1 != bfFollowIds.size() - 1) {
-						changeStr.append("、");
+						subChangStr.append("、");
 					}
 				}
 			} else {
@@ -226,30 +228,30 @@ public class CorpKfServiceImpl implements CorpKfService {
 				List<String> afUserIds = Jsons.parseList(afUserStr, String.class);
 				for (String userId : bfUserIds) {
 					if (!afUserIds.contains(userId)) {
-						if (!changeStr.toString().contains("移除")) {
-							changeStr.append("移除");
+						if (!subChangStr.toString().contains("移除")) {
+							subChangStr.append("移除");
 						}
-						if (changeStr.length() > 4) {
-							changeStr.append("、");
+						if (subChangStr.length() > 0) {
+							subChangStr.append("、");
 						}
-						changeStr.append(followMap.get(userId).get(0).getName());
+						subChangStr.append(followMap.get(userId).get(0).getName());
 					}
 				}
 				for (String afterUserId : afUserIds) {
 					if (!bfUserIds.contains(afterUserId)) {
-						if (!changeStr.toString().contains("增加")) {
-							changeStr.append("增加");
+						if (!addChangeStr.toString().contains("增加")) {
+							addChangeStr.append("增加");
 						}
-						if (changeStr.length() > 4) {
-							changeStr.append("、");
+						if (addChangeStr.length() > 0) {
+							addChangeStr.append("、");
 						}
-						changeStr.append(followMap.get(afterUserId).get(0).getName());
+						addChangeStr.append(followMap.get(afterUserId).get(0).getName());
 					}
 				}
 			}
 		}
-		if (changeStr.length() > 2) {
-			corpKfFollowChangeRecord.setChangeStr(changeStr.toString());
+		if (addChangeStr.length() > 0 || subChangStr.length() > 0) {
+			corpKfFollowChangeRecord.setChangeStr(changeStr.append(addChangeStr).append("-").append(subChangStr).toString());
 			corpKfFollowChangeRecordMapper.insert(corpKfFollowChangeRecord);
 		}
 	}