modify:修改变更执行人赋值逻辑

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

@@ -194,7 +194,7 @@ public class ChangeFlowBiz {
                         .queryCommanderInfo(ChangeCommanderPO.builder().parentChangeClassId(parentChangeClassId)
                                 .sonChangeClassId(sonChangeClassId).changeSupplierId(changeFlowCreateReq.getChangeSupplier())
                                 .goodsInfos(itemIds).flowCreator(uid).createSource(changeFlowCreateReq.getCreateSource())
-                                .supplier(changeFlowCreateReq.getSupplier()).build());
+                                .supplier(changeFlowCreateReq.getSupplier()).build(), changeFlowCreateReq.getChangeCommander());
                 changeCommander = goodsResponseRpc.getEmail();
             } catch (Exception e) {
                 log.error("[op:queryCommanderInfo] error, goodsResponseRpc:{}, e:{}", JSON.toJSONString(goodsResponseRpc), e);

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

@@ -6,7 +6,6 @@ import java.util.Map;
 import com.netease.mail.yanxuan.change.dal.meta.model.po.ChangeCommanderPO;
 import com.netease.mail.yanxuan.change.dal.meta.model.po.ChangeGoodsPrincipalPO;
 import com.netease.mail.yanxuan.change.dal.meta.model.po.QueryCommanderEmailReq;
-import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowCreateReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.rpc.CommanderResponse;
 import com.netease.mail.yanxuan.change.dal.meta.model.rpc.GoodsResponseRpc;
 
@@ -20,9 +19,10 @@ public interface InteriorChangeConfigService {
     /**
      * 根据变更信息 返回住变更负责人
      * @param changeCommander
+     * @param commander
      * @return
      */
-    GoodsResponseRpc queryCommanderInfo(ChangeCommanderPO changeCommander);
+    GoodsResponseRpc queryCommanderInfo(ChangeCommanderPO changeCommander, String commander);
 
     /**
      * 传入商品列表 返回商品信息

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

@@ -84,10 +84,11 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
      * 接口不完整,关于商品的查询已经完成 供应商查询不完整接口已对接 具体返回值接口测试未完成
      *
      * @param changeCommander
+     * @param commander
      * @return
      */
     @Override
-    public GoodsResponseRpc queryCommanderInfo(ChangeCommanderPO changeCommander) {
+    public GoodsResponseRpc queryCommanderInfo(ChangeCommanderPO changeCommander, String commander) {
         GoodsResponseRpc rpc = new GoodsResponseRpc();
         //获取模板名称   通过一级变更类型 二级变更类型ID 定位模板
         ChangeConfig changeConfig = changeConfigService.queryChangeType(changeCommander.getParentChangeClassId(),
@@ -125,6 +126,12 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
                     changeConfig.getChangeCommander());
             return goodsResponseRpcList.get(0);
         } else if (Objects.equals(ChangeSubjectEnum.SUPPLIER.getType(), changeConfig.getChangeSubject())) {
+            if (ChangeCommanderEnum.SUPPLIERS_ASSOCIATED.equals(changeCommanderEnum)
+                    && SupplierChangePrincipalEnum.PURCHASE.getName().equals(changeConfig.getChangeCommander())) {
+                GoodsResponseRpc goodsResponseRpc = new GoodsResponseRpc();
+                goodsResponseRpc.setEmail(commander);
+                return goodsResponseRpc;
+            }
             //供应商  采购 计划 SQE
             List<GoodsResponseRpc> goodsResponseRpcList = queryChangeSupplier(changeCommanderEnum, changeCommander.getChangeSupplierId(),
                     changeConfig.getChangeCommander());