From e5b55dc1854d2635d745e3911cf1dc162d1b81d8 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Sun, 27 Dec 2020 12:28:44 +0800 Subject: [PATCH] modify --- zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml | 8 ++++++++ 1 files changed, 8 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 1af5845..8a8975c 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml @@ -657,6 +657,7 @@ FROM ( SELECT + b.id id, b.create_time as createTime, e.CODE, e.NAME, @@ -708,6 +709,7 @@ UNION ALL SELECT + t2_b.id id, t2_b.create_time, t2_e.CODE, t2_e.NAME, @@ -811,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 @@ -846,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