diff --git a/dl_admin/ruoyi-admin/pom.xml b/dl_admin/ruoyi-admin/pom.xml
index d187dfe..aa18d45 100644
--- a/dl_admin/ruoyi-admin/pom.xml
+++ b/dl_admin/ruoyi-admin/pom.xml
@@ -9,7 +9,7 @@
4.0.0
jar
- industry-ai
+ chengda-crm
web服务入口
diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/controller/CusBankController.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/controller/CusBankController.java
index 150426f..a7759bd 100644
--- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/controller/CusBankController.java
+++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/controller/CusBankController.java
@@ -42,7 +42,6 @@ public class CusBankController extends BaseController
/**
* 查询客户银行资料列表
*/
- @PreAuthorize("@ss.hasPermi('cus:bank:list')")
@GetMapping("/list")
public AjaxResult list(CusBank cusBank,
@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/controller/CusEmailController.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/controller/CusEmailController.java
index 267094d..00b4c56 100644
--- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/controller/CusEmailController.java
+++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/controller/CusEmailController.java
@@ -53,7 +53,6 @@ public class CusEmailController extends BaseController
/**
* 查询客户来往邮件列表
*/
- @PreAuthorize("@ss.hasPermi('cus:email:list')")
@GetMapping("/list")
public AjaxResult list(CusEmail cusEmail,
@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/controller/CusFollowController.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/controller/CusFollowController.java
index 09b2f60..8da31f4 100644
--- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/controller/CusFollowController.java
+++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/controller/CusFollowController.java
@@ -49,7 +49,6 @@ public class CusFollowController extends BaseController
/**
* 查询客户跟进记录列表
*/
- @PreAuthorize("@ss.hasPermi('cus:follow:list')")
@GetMapping("/list")
public AjaxResult list(CusFollowVO cusFollow,
@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/impl/CusMainServiceImpl.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/impl/CusMainServiceImpl.java
index f50e4da..179a3e5 100644
--- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/impl/CusMainServiceImpl.java
+++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/impl/CusMainServiceImpl.java
@@ -70,10 +70,27 @@ public class CusMainServiceImpl extends ServiceImpl impl
@DataScope(deptAlias = "cm", userAlias = "cm")
public IPage queryListPage(MainVO pageReqVO, Page page) {
IPage list = cusMainMapper.queryListPage(pageReqVO, page);
+ List cusIdList = list.getRecords().stream().map(MainVO::getId).collect(Collectors.toList());
+ //公司信息
+ List companyList = cusCompanyService.list(new LambdaQueryWrapper().in(CusCompany::getCusId, cusIdList).eq(DlBaseEntity::getDelFlag,'0'));
+ Map companyMap = companyList.stream().collect(Collectors.toMap(CusCompany::getCusId, Function.identity()));
+ //联系人信息
+ List contacts = cusContactsService.list(new LambdaQueryWrapper().in(CusContacts::getCusId, cusIdList).eq(DlBaseEntity::getDelFlag,'0').eq(CusContacts::getIfDefault,true));
+ Map contactsMap = contacts.stream().collect(Collectors.toMap(CusContacts::getCusId, Function.identity()));
list.getRecords().forEach(item->{
if(StringUtils.isNotEmpty(item.getCusLabels())){
item.setCusLabelList(JSON.parseArray(item.getCusLabels()));
}
+ if(companyMap.containsKey(item.getId())){
+ CusCompany company = companyMap.get(item.getId());
+ item.setCusFrom(company.getCusFrom());
+ item.setCusLevel(company.getCusLevel());
+ item.setBusiType(company.getBusiType());
+ item.setContactAddress(company.getContactAddress());
+ }
+ if(contactsMap.containsKey(item.getId())){
+ item.setContactName(contactsMap.get(item.getId()).getName());
+ }
});
return list;
}
diff --git a/dl_admin/ruoyi-admin/src/main/resources/application-druid.yml b/dl_admin/ruoyi-admin/src/main/resources/application-druid.yml
index ae1238f..9630cf4 100644
--- a/dl_admin/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/dl_admin/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,7 +6,7 @@ spring:
druid:
# 主库数据源
master:
- url: jdbc:mysql://rm-bp1msd0a4kq4t7a66lo.mysql.rds.aliyuncs.com:3306/dl_crm_system?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://rm-bp1msd0a4kq4t7a66lo.mysql.rds.aliyuncs.com:3306/dl_crm_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: csd_rw
password: Csd2025#123
# 从库数据源
diff --git a/dl_admin/ruoyi-admin/src/main/resources/application.yml b/dl_admin/ruoyi-admin/src/main/resources/application.yml
index 2797699..545e1b3 100644
--- a/dl_admin/ruoyi-admin/src/main/resources/application.yml
+++ b/dl_admin/ruoyi-admin/src/main/resources/application.yml
@@ -8,7 +8,7 @@ ruoyi:
copyrightYear: 2025
# 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
# profile: D:/ruoyi/uploadPath
- profile: /Users/menfutong/Desktop
+ profile: /chengda/uploadPath
#爬虫附件下载路径
server-url: http://10.19.128.77:8099
# 获取ip地址开关
diff --git a/dl_admin/ruoyi-admin/src/main/resources/mapper/cus/CusMainMapper.xml b/dl_admin/ruoyi-admin/src/main/resources/mapper/cus/CusMainMapper.xml
index 4fafcb3..b42ddc2 100644
--- a/dl_admin/ruoyi-admin/src/main/resources/mapper/cus/CusMainMapper.xml
+++ b/dl_admin/ruoyi-admin/src/main/resources/mapper/cus/CusMainMapper.xml
@@ -55,25 +55,15 @@