From 474074963695781be2f93a3e4a1d7fc32cf932f1 Mon Sep 17 00:00:00 2001
From: Lenovo <zhuacang@163.com>
Date: Tue, 16 Jul 2024 16:09:47 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=989=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/business/BusIntegralRecordMapper.xml     | 2 ++
 ruoyi-ui/src/views/statistics/shop/index.vue                  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/business/BusIntegralRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusIntegralRecordMapper.xml
index f2770e1..28c3a76 100644
--- a/ruoyi-system/src/main/resources/mapper/business/BusIntegralRecordMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/business/BusIntegralRecordMapper.xml
@@ -27,10 +27,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateType != null  and updateType != ''"> and update_type = #{updateType}</if>
             <if test="integralUpdateTime != null "> and Integral_update_time = #{integralUpdateTime}</if>
             <if test="agentRemark != null  and agentRemark != ''"> and agent_remark = #{agentRemark}</if>
+            <if test="agentAccount != null">
             and account in
             <foreach collection="agentAccount" open="(" close=")" item="account" separator="," index="i">
                 #{account}
             </foreach>
+            </if>
             <if test="account != null  and account != ''"> and account = #{account}</if>
         </where>
     </select>
diff --git a/ruoyi-ui/src/views/statistics/shop/index.vue b/ruoyi-ui/src/views/statistics/shop/index.vue
index bca78c4..4b03fd6 100644
--- a/ruoyi-ui/src/views/statistics/shop/index.vue
+++ b/ruoyi-ui/src/views/statistics/shop/index.vue
@@ -99,7 +99,7 @@
         </el-col>
 
 
-        <el-col :span="8">
+        <el-col :span="9">
           <el-form-item label="创建时间">
             <el-date-picker
               v-model="dateRange"
@@ -122,7 +122,7 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="6">
+        <el-col :span="5">
           <el-form-item label="开启数量" ><span>{{map.openCount}}</span></el-form-item>
         </el-col>
       </el-row>