Merge remote-tracking branch 'origin/feature-changeFlow-221110' into feature-changeFlow-221110

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/impl/change/AdminChangeConfigServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.google.common.base.Joiner;
 import com.netease.mail.yanxuan.change.biz.meta.exception.ExceptionFactory;
 import com.netease.mail.yanxuan.change.biz.service.change.AdminChangeConfigService;
 import com.netease.mail.yanxuan.change.biz.service.change.ChangeConfigService;
@@ -34,8 +35,11 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 /**
  * @author WangJiaXiang
@@ -68,7 +72,11 @@ public class AdminChangeConfigServiceImpl implements AdminChangeConfigService {
         Long total = pageInfo.getTotal();
         PageVO pageVO = buildPageVo(total.intValue(), pageSize, pageNum);
         List<ChangeConfigPo> changeConfig = pageInfo.getList();
-        changeConfig.forEach(i -> i.getParticipateChangeExecDepartment().replace("[", "").replace("]", ""));
+        changeConfig.forEach(i -> {
+            String replaceDep = i.getParticipateChangeExecDepartment().replace("[", "").replace("]", "").replace(" ", "");
+            Set<String> finialDep = Arrays.stream(replaceDep.split(",")).collect(Collectors.toSet());
+            i.setParticipateChangeExecDepartment(Joiner.on(",").join(finialDep));
+        });
         vo.setChangeConfigs(changeConfig);
         vo.setPageVo(pageVO);
         return AjaxResult.success(vo);