From d4c997972509c2da06b1128086b1735597823d3f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 30 Nov 2021 17:19:20 +0800
Subject: [PATCH] Merge branch 'ty_fix' of http://120.27.238.55:7000/r/beauty-erp into ty_fix

---
 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