From b026000678b45d14970bca3b8052e377072f4af2 Mon Sep 17 00:00:00 2001 From: wzy <wzy19931122ai@163.com> Date: Sat, 26 Dec 2020 23:10:22 +0800 Subject: [PATCH] Merge branch 'ty_urgent' into test --- zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml index df354d5..8a8975c 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml @@ -813,6 +813,9 @@ <if test=" record.endTime!=null "> <![CDATA[ and #{record.endTime} >=b.create_time]]> </if> + <if test="record.companyId != null and record.companyId !='' "> + and b.company_id = #{record.companyId} + </if> </where> UNION ALL SELECT @@ -848,6 +851,9 @@ <if test=" record.endTime!=null "> <![CDATA[ and #{record.endTime} >= t2_b.create_time ]]> </if> + <if test="record.companyId != null and record.companyId !='' "> + and t2_b.company_id = #{record.companyId} + </if> </where> ) t -- Gitblit v1.9.1