|
@@ -259,8 +259,11 @@ public class TBDingController {
|
|
result.setCrmName(tbCrm.getName());
|
|
result.setCrmName(tbCrm.getName());
|
|
result.setCustomId(crmProjectResult.getCustomId());
|
|
result.setCustomId(crmProjectResult.getCustomId());
|
|
result.setCustomName(crmProjectResult.getCustomName());
|
|
result.setCustomName(crmProjectResult.getCustomName());
|
|
- result.setCustomType(crmProjectResult.getCustomType());
|
|
|
|
- result.setCustomTypeStr(crmProjectResult.getCustomType().getTitle());
|
|
|
|
|
|
+ ProductTypeEnum productTypeEnum = crmProjectResult.getCustomType();
|
|
|
|
+ if (Objects.nonNull(productTypeEnum)){
|
|
|
|
+ result.setCustomType(productTypeEnum);
|
|
|
|
+ result.setCustomTypeStr(crmProjectResult.getCustomType().getTitle());
|
|
|
|
+ }
|
|
sopInfo.add(result);
|
|
sopInfo.add(result);
|
|
}
|
|
}
|
|
cell.setSopInfo(sopInfo);
|
|
cell.setSopInfo(sopInfo);
|