From 0219dce1a88fd385edc1412cb44cec83d3859b5e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 16 九月 2022 14:42:24 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/cstmr/cstmr.js | 1 +
src/main/resources/mapper/CstmrMapper.xml | 18 +++++++++---------
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/CstmrMapper.xml b/src/main/resources/mapper/CstmrMapper.xml
index a46f65c..35ca255 100644
--- a/src/main/resources/mapper/CstmrMapper.xml
+++ b/src/main/resources/mapper/CstmrMapper.xml
@@ -63,15 +63,15 @@
</if>
<if test="condition != null and condition != ''">
and (
- and mc.uuid like concat('%',#{condition},'%')
- and mc.name like concat('%',#{condition},'%')
- and mc.simple like concat('%',#{condition},'%')
- and mc.rela like concat('%',#{condition},'%')
- and mc.tel like concat('%',#{condition},'%')
- and mc.contacts like concat('%',#{condition},'%')
- and mc.remarks like concat('%',#{condition},'%')
- and mc.director like concat('%',#{condition},'%')
- and mc.addr like concat('%',#{condition},'%')
+ mc.uuid like concat('%',#{condition},'%')
+ or mc.name like concat('%',#{condition},'%')
+ or mc.simple like concat('%',#{condition},'%')
+ or mc.rela like concat('%',#{condition},'%')
+ or mc.tel like concat('%',#{condition},'%')
+ or mc.contacts like concat('%',#{condition},'%')
+ or mc.remarks like concat('%',#{condition},'%')
+ or mc.director like concat('%',#{condition},'%')
+ or mc.addr like concat('%',#{condition},'%')
)
</if>
ORDER BY mc.create_time DESC
diff --git a/src/main/webapp/static/js/cstmr/cstmr.js b/src/main/webapp/static/js/cstmr/cstmr.js
index f89b75c..30728b5 100644
--- a/src/main/webapp/static/js/cstmr/cstmr.js
+++ b/src/main/webapp/static/js/cstmr/cstmr.js
@@ -55,6 +55,7 @@
$('#organization').text(obj.data.title);
$('#organizationTree').find('.ew-tree-click').removeClass('ew-tree-click');
$(obj.elem).children('.layui-tree-entry').addClass('ew-tree-click');
+ clearFormVal($('#search-box'));
tableIns.reload({
where: {[obj.data.key]: obj.data.id},
page: {curr: 1}
--
Gitblit v1.9.1