diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java index b8320e2040..4e92d6ec58 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java @@ -242,18 +242,20 @@ public class CrmCustomerTempService extends MybatisBaseService pagging = baseMapper.selectPageVo(page, qw); for (CrmCustomerTempVo record : pagging.getRecords()) { String createOrgSid = record.getCreateOrgSid(); - String staffSid = record.getStaffSid(); String createOrgName = sysOrganizationFeign.fetchBySid(createOrgSid).getData().getName(); record.setCreateOrgName(createOrgName); // String staffName = sysStaffinfoFeign.fetchBySid(staffSid).getData().getName(); // record.setStaffName(staffName); - List sysStaffOrgVos = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid).getData(); - for (SysStaffOrgVo sysStaffOrgVo : sysStaffOrgVos) { - SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(sysStaffOrgVo.getOrgSid()).getData(); - String psid = sysOrganizationVo.getPsid(); - if (psid.equals(createOrgSid)) { - String orgName = sysStaffOrgVo.getOrgName(); - record.setDeptName(orgName); + if (StringUtils.isNotBlank(record.getStaffSid())) { + String staffSid = record.getStaffSid(); + List sysStaffOrgVos = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid).getData(); + for (SysStaffOrgVo sysStaffOrgVo : sysStaffOrgVos) { + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(sysStaffOrgVo.getOrgSid()).getData(); + String psid = sysOrganizationVo.getPsid(); + if (psid.equals(createOrgSid)) { + String orgName = sysStaffOrgVo.getOrgName(); + record.setDeptName(orgName); + } } } }