From 9c5d7547fa9b37c09659c90448ade6df6db4f2de Mon Sep 17 00:00:00 2001
From: JiangYouYao <ak473600000>
Date: Tue, 15 Mar 2022 10:46:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into develop
---
zq-erp/src/main/resources/mybatis/mapper/hive/QuestionDao.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/QuestionDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/QuestionDao.xml
index 9d9e344..ea70d23 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/QuestionDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/QuestionDao.xml
@@ -50,7 +50,10 @@
FROM
question a
LEFT JOIN vip_answer b ON a.id = b.quesion_id and b.vip_id=#{id}
- WHERE category=#{type}
+ WHERE
+ a.company_id=#{companyId}
+ and category=#{type}
+
ORDER BY order_field DESC
</select>
--
Gitblit v1.9.1