fix

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

@@ -13,10 +13,7 @@ import com.cyksj.common.util.Jsons;
 import com.cyksj.common.util.StringUtil;
 import com.cyksj.config.corp.YHLXWxCorpConfig;
 import com.cyksj.mapper.corp.CorpFollowMapper;
-import com.cyksj.mapper.corp.kf.CorpKfAccountFollowMapper;
-import com.cyksj.mapper.corp.kf.CorpKfAccountMapper;
-import com.cyksj.mapper.corp.kf.CorpKfAccountSessionConfigMapper;
-import com.cyksj.mapper.corp.kf.CorpKfServicerSessionRecordMapper;
+import com.cyksj.mapper.corp.kf.*;
 import com.cyksj.mapper.manage.cms.CmsUserMapper;
 import com.cyksj.model.entity.*;
 import com.cyksj.model.kf.*;
@@ -63,6 +60,8 @@ public class CorpKfServiceImpl implements CorpKfService {
 
 	private final BeanSearcher beanSearcher;
 
+	private final CorpKfFollowChangeRecordMapper corpKfFollowChangeRecordMapper;
+
 	@Override
 	public void addKfAccount(CorpKfAccount corpKfAccount) throws Exception {
 		WxCpKfAccountAdd wxCpKfAccountAdd = new WxCpKfAccountAdd();
@@ -206,8 +205,8 @@ public class CorpKfServiceImpl implements CorpKfService {
 			CorpKfAccountFollow bfCorpKfAccountFollow = before.get(i);
 			Integer bfDutyWeek = bfCorpKfAccountFollow.getDutyWeek();
 			List<CorpKfAccountFollow> afCorpKfAccountFollows = afDutyWeekFollowMap.get(bfDutyWeek);
-			changeStr.append(getDutyWeekName(bfDutyWeek));
 			if (CollUtil.isEmpty(afCorpKfAccountFollows)) {
+				changeStr.append(getDutyWeekName(bfDutyWeek));
 				changeStr.append("移除");
 				List<String> bfFollowIds = Jsons.parseList(bfCorpKfAccountFollow.getUserIdList(), String.class);
 				for (int i1 = 0; i1 < bfFollowIds.size(); i1++) {
@@ -220,8 +219,9 @@ public class CorpKfServiceImpl implements CorpKfService {
 				String bfUserStr = bfCorpKfAccountFollow.getUserIdList();
 				String afUserStr = afCorpKfAccountFollows.get(0).getUserIdList();
 				if (StrUtil.equals(bfUserStr, afUserStr)) {
-					return;
+					continue;
 				}
+				changeStr.append(getDutyWeekName(bfDutyWeek));
 				List<String> bfUserIds = Jsons.parseList(bfUserStr, String.class);
 				List<String> afUserIds = Jsons.parseList(afUserStr, String.class);
 				for (String userId : bfUserIds) {
@@ -229,7 +229,10 @@ public class CorpKfServiceImpl implements CorpKfService {
 						if (!changeStr.toString().contains("移除")) {
 							changeStr.append("移除");
 						}
-						changeStr.append(followMap.get(userId).get(0).getName()).append("、");
+						if (changeStr.length() > 4) {
+							changeStr.append("、");
+						}
+						changeStr.append(followMap.get(userId).get(0).getName());
 					}
 				}
 				for (String afterUserId : afUserIds) {
@@ -237,11 +240,18 @@ public class CorpKfServiceImpl implements CorpKfService {
 						if (!changeStr.toString().contains("增加")) {
 							changeStr.append("增加");
 						}
-						changeStr.append(followMap.get(afterUserId).get(0).getName()).append("、");
+						if (changeStr.length() > 4) {
+							changeStr.append("、");
+						}
+						changeStr.append(followMap.get(afterUserId).get(0).getName());
 					}
 				}
 			}
 		}
+		if (changeStr.length() > 2) {
+			corpKfFollowChangeRecord.setChangeStr(changeStr.toString());
+			corpKfFollowChangeRecordMapper.insert(corpKfFollowChangeRecord);
+		}
 	}
 
 	@Override