From 820f5e29839322d2e123380970b81a17f27d85a3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 25 三月 2019 17:32:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/mapping/lable/QualityFactoryMapper.xml | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/lable/QualityFactoryMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/lable/QualityFactoryMapper.xml
index 5a9e34f..97eaf44 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/lable/QualityFactoryMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/lable/QualityFactoryMapper.xml
@@ -417,7 +417,9 @@
<if test='keyType == 3'>
AND lab.`lab_title` = '${key}'
</if>
-
+ <if test='keyType == 4'>
+ AND tb.`shopTitle` = '${key}'
+ </if>
</if>
ORDER BY
@@ -577,7 +579,9 @@
<if test='keyType == 3'>
AND lab.`lab_title` = '${key}'
</if>
-
+ <if test='keyType == 4'>
+ AND tb.`shopTitle` = '${key}'
+ </if>
</if>
) a LEFT JOIN yeshi_ec_quality_factory ts ON ts.`sg_id`=a.id
--
Gitblit v1.8.0