|
@@ -1383,6 +1383,9 @@ public class CustomerApiController {
|
|
|
|
|
|
|
|
|
String salecom = source.getString("salecom"); // 可能会得到用逗号分割的多个标签
|
|
|
+ if (salecom == null) {
|
|
|
+ salecom = "";
|
|
|
+ }
|
|
|
String[] salecoms = salecom.split(",");
|
|
|
Arrays.sort(salecoms);
|
|
|
Map<String, Object> sourceMap = JSON.parseObject(jsonObject.getString("_source"), Map.class);
|
|
@@ -1393,6 +1396,9 @@ public class CustomerApiController {
|
|
|
// 登录用户的渠道与客户渠道一致,返回jsonObject中的公共标签 + shanglifeecif.customerno_salecom_relation表中的渠道标签
|
|
|
mpInfo.putAll(getPublicLabels(sourceMap));
|
|
|
mpInfo.putAll(getSalecomLabels(source.getString("scustid"), deptCode));
|
|
|
+ } else {
|
|
|
+ // 未找到渠道,不返回渠道标签
|
|
|
+ logger.info(String.format("登录渠道和客户所属渠道不匹配,不返回渠道标签,登录渠道 [%s],客户所属渠道 [%s]", deptCode, salecom));
|
|
|
}
|
|
|
|
|
|
if(mpInfo.containsKey("birthday")){
|