فهرست منبع

1.测试环境更新
2.修复查询企业客户筛选终端客户条件无效

GouGengquan 3 روز پیش
والد
کامیت
502e34a706

+ 27 - 1
biz-base/src/main/resources/application-test.yml

@@ -57,4 +57,30 @@ ueditor:
   uploadPath: ${dfs.path}
   urlPrefix: replaceurl  #动态替换url
 
-posyspath:  /root/pageoffice
+posyspath:  /root/pageoffice
+
+# 配置邮件
+mail:
+  configs:
+    # 邮箱信息
+    - business-name: hr_payslip_01
+      host: smtp.qq.com #host
+      port: 465 #端口
+      protocol: smtp #协议
+      username: 120135497@qq.com #邮箱
+      password: lvpvckqtywbubiid #密码或授权码
+      default-encoding: UTF-8
+      auth: true #smtp auth
+      SSL-enable: true #ssl加密是否开启
+      SSL-required: true #ssl加密是否必须
+    - business-name: hr_payslip_02
+      host: smtp.qq.com #host
+      port: 465 #端口
+      protocol: smtp #协议
+      username: xxxxxx@qq.com #邮箱
+      password: xxxxxx #密码或授权码
+      default-encoding: UTF-8
+      auth: true #smtp auth
+      SSL-enable: true #ssl加密是否开启
+      SSL-required: true #ssl加密是否必须
+    # 多个邮箱则以相同格式再添加一个信息在configs下

+ 1 - 1
dao/src/main/resources/mapper/CustomerCompanyMapper.xml

@@ -103,7 +103,7 @@
                                      WHERE personal.deleted = 0
                                      GROUP BY personal.clientele_sub_id) AS t
                             GROUP BY clientele_sub_id) AS vol ON vol.clientele_sub_id = company.id
-        WHERE company.level = 1 OR (company.terminal = 1 AND company.level = 0)
+        WHERE (company.level = 1 OR (company.terminal = 1 AND company.level = 0))
             <if test="dto != null">
                 <if test="dto.companyName != null">
                     AND company.name LIKE CONCAT('%',#{dto.companyName},'%')

+ 2 - 2
sql/update_sql.sql

@@ -1005,7 +1005,7 @@ CREATE TABLE `assets_complaint`
 /**
   日期:2025-07-29
   修改人:苟耕铨
-  更新到test-env
+  更新到test-env
  */
 #  新增人力资源_薪资(工资条)通知邮件表
 DROP TABLE IF EXISTS `hr_payslip_email`;
@@ -1034,7 +1034,7 @@ CREATE TABLE `hr_payslip_email`
 /**
   日期:2025-08-07
   修改人:苟耕铨
-  更新到test-env
+  更新到test-env
  */
 # 新增索引
 ALTER TABLE assets ADD KEY `idx_clientele_sub_id` (`clientele_sub_id`) USING BTREE;