From 187ee29fa278a103cac1e8ce89b7faa75881ac4e Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Sat, 12 Oct 2024 13:33:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=A2=E6=88=B7=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CrmCustomerTempService.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) 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); + } } } }