From b5960ac13f8d67c0baf8f23ffb2e24de1494cbf7 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 14 Mar 2022 15:27:25 +0800 Subject: [PATCH] Merge branch 'developer' into alpha --- 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