merge:feature-modifyDownload-230129:operator:hzhuyuanyuan@corp.netease.com:auto_…

merge:feature-modifyDownload-230129:operator:hzhuyuanyuan@corp.netease.com:auto_branch_merge_by_branchService_end

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

@@ -32,48 +32,48 @@ public class AppConfig {
     /**
      * 商品关联开发兜底人名
      */
-    @Value("${change.goods.functionary.name:\"钱伟钰\"}")
+    @Value("${change.goods.functionary.name:钱伟钰}")
     private String functionaryName;
 
     /**
      * 商品关联开发兜底邮箱
      */
-    @Value("${change.goods.functionary.email:\"qianweiyu@corp.netease.com\"}")
+    @Value("${change.goods.functionary.email:qianweiyu@corp.netease.com}")
     private String functionaryEmail;
 
     /**
      * 商品关联采购兜底人名
      */
-    @Value("${change.goods.purchase.name:\"陈金灿\"}")
+    @Value("${change.goods.purchase.name:陈金灿}")
     private String purchaseName;
 
     /**
      * 商品关联采购兜底邮箱
      */
-    @Value("${change.goods.purchase.email:\"bjchenjincan@corp.netease.com\"}")
+    @Value("${change.goods.purchase.email:bjchenjincan@corp.netease.com}")
     private String purchaseEmail;
     /**
      * 商品关联计划兜底人名
      */
-    @Value("${change.goods.project.name:\"王敏\"}")
+    @Value("${change.goods.project.name:王敏}")
     private String goodsProjectName;
 
     /**
      * 商品关联计划兜底邮箱
      */
-    @Value("${change.goods.project.email:\"wangmin12@corp.netease.com\"}")
+    @Value("${change.goods.project.email:wangmin12@corp.netease.com}")
     private String goodsProjectEmail;
 
     /**
      * 商品关联SQE兜底邮箱
      */
-    @Value("${change.goods.sqe.name:\"崔亦仙\"}")
+    @Value("${change.goods.sqe.name:崔亦仙}")
     private String sqeName;
 
     /**
      * 商品关联SQE兜底邮箱
      */
-    @Value("${change.goods.sqe.email:\"cuiyixian@corp.netease.com\"}")
+    @Value("${change.goods.sqe.email:cuiyixian@corp.netease.com}")
     private String sqeEmail;
 
     /**

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

@@ -266,6 +266,7 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
         req.setSupplierIdList(supplierIdList);
         //进行参数解析
         List<SupplierUserRsp> listAjaxResponse = supplierInfoService.querySupplierRelatedUser(req);
+        log.debug("[querySupplierRelatedUser] response:{}", JSON.toJSONString(listAjaxResponse));
         if (!CollectionUtils.isEmpty(listAjaxResponse)) {
             SupplierUserRsp supplierUserRsp = listAjaxResponse.get(0);
             Map<String, String> uid2NameMap = supplierUserRsp.getUid2NameMap();
@@ -490,18 +491,22 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
                     //BU
                     goodsRpc.setFunctionaryName(appConfig.getFunctionaryName());
                     goodsRpc.setFunctionaryEmail(appConfig.getFunctionaryEmail());
+                    break;
                 case 2:
                     //采购
                     goodsRpc.setPurchaseName(appConfig.getPurchaseName());
                     goodsRpc.setPurchaseEmail(appConfig.getPurchaseEmail());
+                    break;
                 case 3:
                     //计划
                     goodsRpc.setGoodsProjectName(appConfig.getGoodsProjectName());
                     goodsRpc.setGoodsProjectEmail(appConfig.getGoodsProjectEmail());
+                    break;
                 case 4:
                     //SQE
                     goodsRpc.setGoodsSqeName(appConfig.getSqeName());
                     goodsRpc.setGoodsSqeEmail(appConfig.getSqeEmail());
+                    break;
             }
 
         }
@@ -513,18 +518,22 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
                 //商品开发
                 goodsResponseRpc.setName(appConfig.getFunctionaryName());
                 goodsResponseRpc.setEmail(appConfig.getFunctionaryEmail());
+                break;
             case 1:
                 //采购
                 goodsResponseRpc.setName(appConfig.getPurchaseName());
                 goodsResponseRpc.setEmail(appConfig.getPurchaseEmail());
+                break;
             case 2:
                 //计划
                 goodsResponseRpc.setName(appConfig.getGoodsProjectName());
                 goodsResponseRpc.setEmail(appConfig.getGoodsProjectEmail());
+                break;
             case 3:
                 //SQE
                 goodsResponseRpc.setName(appConfig.getSqeName());
                 goodsResponseRpc.setEmail(appConfig.getSqeEmail());
+                break;
         }
     }
 
@@ -534,18 +543,22 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
                 //商品开发
                 goodsResponseRpc.setName(appConfig.getFunctionaryName());
                 goodsResponseRpc.setEmail(appConfig.getFunctionaryEmail());
+                break;
             case 2:
                 //采购
                 goodsResponseRpc.setName(appConfig.getPurchaseName());
                 goodsResponseRpc.setEmail(appConfig.getPurchaseEmail());
+                break;
             case 3:
                 //计划
                 goodsResponseRpc.setName(appConfig.getGoodsProjectName());
                 goodsResponseRpc.setEmail(appConfig.getGoodsProjectEmail());
+                break;
             case 4:
                 //SQE
                 goodsResponseRpc.setName(appConfig.getSqeName());
                 goodsResponseRpc.setEmail(appConfig.getSqeEmail());
+                break;
         }
     }