From b2c24b2d4eba06185607fb005a6e1d6abbc3d359 Mon Sep 17 00:00:00 2001
From: 284718418@qq.com <youlinrc321>
Date: Tue, 7 Dec 2021 11:24:46 +0800
Subject: [PATCH] 修改BUG 审批新建分组查询列表
---
src/main/resources/application-pro.yml | 5 ++++-
src/main/resources/mapping/spmk/SpmkApprovalGMapper.xml | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index 38afcc1..f254293 100644
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -206,4 +206,7 @@ config-8timer:
# 客户管理导入服务器保存路径
crm-excel:
realPath: '/data/crm-excel/'
-
+
+#导出zip临时地址
+zip:
+ path: '/data/crm-zip/'
diff --git a/src/main/resources/mapping/spmk/SpmkApprovalGMapper.xml b/src/main/resources/mapping/spmk/SpmkApprovalGMapper.xml
index 58c51cb..86d3748 100644
--- a/src/main/resources/mapping/spmk/SpmkApprovalGMapper.xml
+++ b/src/main/resources/mapping/spmk/SpmkApprovalGMapper.xml
@@ -86,7 +86,10 @@
LEFT JOIN spmk_custom_approval b
ON a.id = b.approval_g_id
- WHERE a.org_code = #{org_code} and b.name like CONCAT('%',#{eaaname},'%')
+ WHERE a.org_code = #{org_code}
+ <if test="eaaname != null and eaaname != '' ">
+ and b.name like CONCAT('%',#{eaaname},'%')
+ </if>
ORDER BY a.ranks, b.ranks,b.id DESC
</select>
--
libgit2 0.26.0