Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
8
8timerapiv200
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
8timerv2
8timerapiv200
Commits
b2c24b2d
Commit
b2c24b2d
authored
Dec 07, 2021
by
284718418@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改BUG 审批新建分组查询列表
parent
4490d7d0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
src/main/resources/application-pro.yml
+4
-1
src/main/resources/mapping/spmk/SpmkApprovalGMapper.xml
+4
-1
No files found.
src/main/resources/application-pro.yml
View file @
b2c24b2d
...
@@ -206,4 +206,7 @@ config-8timer:
...
@@ -206,4 +206,7 @@ config-8timer:
# 客户管理导入服务器保存路径
# 客户管理导入服务器保存路径
crm-excel
:
crm-excel
:
realPath
:
'
/data/crm-excel/'
realPath
:
'
/data/crm-excel/'
#导出zip临时地址
zip
:
path
:
'
/data/crm-zip/'
src/main/resources/mapping/spmk/SpmkApprovalGMapper.xml
View file @
b2c24b2d
...
@@ -86,7 +86,10 @@
...
@@ -86,7 +86,10 @@
LEFT JOIN spmk_custom_approval b
LEFT JOIN spmk_custom_approval b
ON a.id = b.approval_g_id
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
ORDER BY a.ranks, b.ranks,b.id DESC
</select>
</select>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment