|
@@ -117,14 +117,14 @@ public class CrmCustomerController extends BaseController
|
|
|
}
|
|
}
|
|
|
@PreAuthorize("@ss.hasPermi('crm:customer:list')")
|
|
@PreAuthorize("@ss.hasPermi('crm:customer:list')")
|
|
|
@GetMapping("/listAll")
|
|
@GetMapping("/listAll")
|
|
|
- public R listAll(CrmCustomerListQueryParam crmCustomer){
|
|
|
|
|
|
|
+ public TableDataInfo listAll(CrmCustomerListQueryParam crmCustomer){
|
|
|
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
|
|
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
|
|
|
crmCustomer.setCompanyId(loginUser.getCompany().getCompanyId());
|
|
crmCustomer.setCompanyId(loginUser.getCompany().getCompanyId());
|
|
|
|
|
|
|
|
if (!CompanyUser.isAdmin(loginUser.getUser().getUserType())) {
|
|
if (!CompanyUser.isAdmin(loginUser.getUser().getUserType())) {
|
|
|
crmCustomer.setCustomerUserId(loginUser.getUser().getUserId());
|
|
crmCustomer.setCustomerUserId(loginUser.getUser().getUserId());
|
|
|
}
|
|
}
|
|
|
- PageHelper.startPage(1, 1000);
|
|
|
|
|
|
|
+ PageHelper.startPage(crmCustomer.getPageNum(), crmCustomer.getPageSize());
|
|
|
if(!StringUtils.isEmpty(crmCustomer.getReceiveTimeRange())){
|
|
if(!StringUtils.isEmpty(crmCustomer.getReceiveTimeRange())){
|
|
|
crmCustomer.setReceiveTimeList(crmCustomer.getReceiveTimeRange().split("--"));
|
|
crmCustomer.setReceiveTimeList(crmCustomer.getReceiveTimeRange().split("--"));
|
|
|
}
|
|
}
|
|
@@ -136,7 +136,30 @@ public class CrmCustomerController extends BaseController
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- return R.ok().put("rows", list);
|
|
|
|
|
|
|
+ return getDataTable(list);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ @PreAuthorize("@ss.hasPermi('crm:customer:list')")
|
|
|
|
|
+ @GetMapping("/listNoPage")
|
|
|
|
|
+ public TableDataInfo listNoPage(CrmCustomerListQueryParam crmCustomer){
|
|
|
|
|
+ LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
|
|
|
|
|
+ crmCustomer.setCompanyId(loginUser.getCompany().getCompanyId());
|
|
|
|
|
+
|
|
|
|
|
+ if (!CompanyUser.isAdmin(loginUser.getUser().getUserType())) {
|
|
|
|
|
+ crmCustomer.setCustomerUserId(loginUser.getUser().getUserId());
|
|
|
|
|
+ }
|
|
|
|
|
+ if(!StringUtils.isEmpty(crmCustomer.getReceiveTimeRange())){
|
|
|
|
|
+ crmCustomer.setReceiveTimeList(crmCustomer.getReceiveTimeRange().split("--"));
|
|
|
|
|
+ }
|
|
|
|
|
+ List<CrmCustomerListVO> list = crmCustomerService.selectCrmCustomerListQueryParam(crmCustomer);
|
|
|
|
|
+ if (list != null) {
|
|
|
|
|
+ for (CrmCustomerListVO vo : list) {
|
|
|
|
|
+ if(vo.getMobile()!=null){
|
|
|
|
|
+ vo.setMobile(vo.getMobile().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ return getDataTable(list);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@ApiOperation("获取我的协作客户列表")
|
|
@ApiOperation("获取我的协作客户列表")
|