|
|
@ -481,7 +481,7 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa |
|
|
|
AppCrmCustomerTempQuery params = pagerQuery.getParams(); |
|
|
|
String userSid = params.getUserSid(); |
|
|
|
String name = params.getName(); |
|
|
|
String orgPath = params.getOrgPath(); |
|
|
|
// String orgPath = params.getOrgPath();
|
|
|
|
QueryWrapper<CrmCustomerTemp> qw = new QueryWrapper<>(); |
|
|
|
|
|
|
|
if (params != null) { |
|
|
@ -490,13 +490,13 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa |
|
|
|
String staffSid = sysUserFeign.fetchBySid(userSid).getData().getStaffSid(); |
|
|
|
qw.eq("cct.staffSid", staffSid); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(orgPath)) { |
|
|
|
orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); |
|
|
|
qw.eq("cct.createOrgSid", orgPath); |
|
|
|
} else { |
|
|
|
orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); |
|
|
|
qw.eq("cct.createOrgSid", orgPath); |
|
|
|
} |
|
|
|
// if (StringUtils.isNotBlank(orgPath)) {
|
|
|
|
// orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
|
|
|
|
// qw.eq("cct.createOrgSid", orgPath);
|
|
|
|
// } else {
|
|
|
|
// orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
|
|
|
|
// qw.eq("cct.createOrgSid", orgPath);
|
|
|
|
// }
|
|
|
|
if (StringUtils.isNotBlank(name)) { |
|
|
|
qw.like("cct.name", name); |
|
|
|
} |
|
|
@ -504,6 +504,9 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa |
|
|
|
qw.orderByDesc("cct.id"); |
|
|
|
IPage<AppCrmCustomerTempVo> iPage = baseMapper.getCustomerTempListByUserSid(page, qw); |
|
|
|
for (AppCrmCustomerTempVo record : iPage.getRecords()) { |
|
|
|
if (record.getIsOnRemindkey() == 0) { |
|
|
|
record.setRemind_day("未设置提醒"); |
|
|
|
} |
|
|
|
String urlPrefix = fileUploadComponent.getUrlPrefix(); |
|
|
|
String customerPhoto = record.getCustomerPhoto(); |
|
|
|
if (customerPhoto != null) { |
|
|
|