modify: 同舟端发起变更创建人展示供应商id

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java

@@ -1072,9 +1072,7 @@ public class ChangeFlowBiz {
             changeFlowVO.setItemBasicInfoList(null);
         }
         changeFlowVO.setChangeState(changeRecord.getState());
-        changeFlowVO.setChangeCreator(CreateSourceEnum.TONG_ZHOU.getType().equals(changeRecord.getCreateSource())
-            ? changeRecord.getCreateSupplier()
-            : changeRecord.getCreator());
+        changeFlowVO.setChangeCreator(changeRecord.getCreator());
         List<ChangeFlowExecVO> changeFlowExecRecord = changeFlowExecService.getChangeFlowExecRecord(changeRecord.getId());
         try {
             Set<String> userEmail = changeFlowExecRecord.stream().map(ChangeFlowExecVO::getChangeExecUserEmail).collect(Collectors.toSet());
@@ -1113,7 +1111,8 @@ public class ChangeFlowBiz {
                 }
                 changeFlowVO.setChangeCommanderView(commander.get(0).getUserName() + "(" + orgName + ")");
             }
-            if (!CollectionUtils.isEmpty(creator)) {
+            // 非同舟端展示人名及三级部门名称
+            if (!CreateSourceEnum.TONG_ZHOU.getType().equals(changeRecord.getCreateSource()) && !CollectionUtils.isEmpty(creator)) {
                 Optional<SecondaryDepartments> anyOrg = creator.stream().filter(o -> o.getOrgPosLevel() == 97).findAny();
                 String orgName = "无三级部门";
                 if (anyOrg.isPresent()) {
@@ -1121,6 +1120,10 @@ public class ChangeFlowBiz {
                 }
                 changeFlowVO.setChangeCreatorView(creator.get(0).getUserName() + "(" + orgName + ")");
             }
+            // 同舟端发起变更，发起人展示供应商id
+            if (CreateSourceEnum.TONG_ZHOU.getType().equals(changeRecord.getCreateSource())) {
+                changeFlowVO.setChangeCreatorView(changeRecord.getCreateSupplier());
+            }
         } catch (Exception ex) {
             log.error("add org has ex", ex);
         }