Merge branch 'master' of http://114.55.243.137:6688/dianliang/dl_crm_system

dl_admin/ruoyi-admin/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
-    <artifactId>industry-ai</artifactId>
+    <artifactId>chengda-crm</artifactId>
 
     <description>
         web服务入口

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,

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,

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,

dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/impl/CusMainServiceImpl.java

@@ -70,10 +70,27 @@ public class CusMainServiceImpl extends ServiceImpl<CusMainMapper,CusMain>  impl
     @DataScope(deptAlias = "cm", userAlias = "cm")
     public IPage<MainVO> queryListPage(MainVO pageReqVO, Page<CusMain> page) {
         IPage<MainVO> list = cusMainMapper.queryListPage(pageReqVO, page);
+        List<String> cusIdList = list.getRecords().stream().map(MainVO::getId).collect(Collectors.toList());
+        //公司信息
+        List<CusCompany> companyList = cusCompanyService.list(new LambdaQueryWrapper<CusCompany>().in(CusCompany::getCusId, cusIdList).eq(DlBaseEntity::getDelFlag,'0'));
+        Map<String, CusCompany> companyMap = companyList.stream().collect(Collectors.toMap(CusCompany::getCusId, Function.identity()));
+        //联系人信息
+        List<CusContacts> contacts = cusContactsService.list(new LambdaQueryWrapper<CusContacts>().in(CusContacts::getCusId, cusIdList).eq(DlBaseEntity::getDelFlag,'0').eq(CusContacts::getIfDefault,true));
+        Map<String, CusContacts> 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;
     }

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
             # 从库数据源

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地址开关

dl_admin/ruoyi-admin/src/main/resources/mapper/cus/CusMainMapper.xml

@@ -55,25 +55,15 @@
 
     <select id="queryListPage" parameterType="com.ruoyi.cus.vo.MainVO" resultType="com.ruoyi.cus.vo.MainVO">
         SELECT
-        cm.*,
+        cm.*
-        cc.cus_from AS cusFrom,
-        cc.cus_level AS cusLevel,
-        cc.busi_type AS busiType,
-        cc.contact_address AS contactAddress,
-        cct.`name` AS contactName
         FROM
         cus_main cm
-        LEFT JOIN cus_company cc ON cm.id = cc.cus_id
-        AND cc.del_flag = '0'
-        LEFT JOIN cus_contacts cct ON cm.id = cct.cus_id
-        AND cct.if_default = 1
-        AND cct.del_flag = '0'
         WHERE
         cm.del_flag = '0'
         <if test="entity.cusCode!=null and entity.cusCode!=''">
             AND cm.cus_code = #{entity.cusCode}
         </if>
-        <if test="entity.fullName!=null and entity.cusCode!=''">
+        <if test="entity.fullName!=null and entity.fullName!=''">
             AND cm.full_name LIKE CONCAT('%',#{entity.fullName},'%')
         </if>
         <if test="entity.shortName!=null and entity.shortName!=''">

dl_vue/.env.production

@@ -4,5 +4,6 @@ VUE_APP_TITLE = 成事达CRM客户管理平台
 # 生产环境配置
 ENV = 'production'
 
-# 成事达CRM客户管理平台/生产环境
+# 成事达CRM客户管理平台/开发环境
-VUE_APP_BASE_API = 'https://www.ddtg.site/noticeApi'
+VUE_APP_BASE_API = 'http://47.98.190.165:8099'
+