From 563aad498b0a480c63833eb1666006a92b66e129 Mon Sep 17 00:00:00 2001
From: wangshuai <daws172839@163.com>
Date: Sun, 21 Jul 2024 17:37:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=85=E5=80=BC=E6=8C=89=E9=92=AE=20?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=A7=AF=E5=88=86sql=20=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=B7=B2=E8=90=A5=E9=94=80=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/business/BusAgentInfoMapper.xml  | 2 +-
 .../resources/mapper/business/BusReturnVisitInfoMapper.xml     | 2 +-
 ruoyi-ui/src/views/agent/list/index.vue                        | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/business/BusAgentInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusAgentInfoMapper.xml
index 024c0a1..85068de 100644
--- a/ruoyi-system/src/main/resources/mapper/business/BusAgentInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/business/BusAgentInfoMapper.xml
@@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getIntegralByAccount" resultType="java.lang.Integer" >
         select ai_duration_balance
         from bus_agent_info
-        where id = #{account}
+        where agent_account = #{account}
     </select>
 
     <insert id="insertBusAgentInfo" parameterType="BusAgentInfo">
diff --git a/ruoyi-system/src/main/resources/mapper/business/BusReturnVisitInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusReturnVisitInfoMapper.xml
index 7f0a1d3..a58cd90 100644
--- a/ruoyi-system/src/main/resources/mapper/business/BusReturnVisitInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/business/BusReturnVisitInfoMapper.xml
@@ -131,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectBusReturnVisitInfoVo"/>
         <where>
             <if test="privcyPhone != null  and privcyPhone != ''"> and phone_number = #{privcyPhone}</if>
-            and return_visit_time is null
+            and return_visit_time is not null
         </where>
     </select>
 
diff --git a/ruoyi-ui/src/views/agent/list/index.vue b/ruoyi-ui/src/views/agent/list/index.vue
index d5d0220..1a8d92d 100644
--- a/ruoyi-ui/src/views/agent/list/index.vue
+++ b/ruoyi-ui/src/views/agent/list/index.vue
@@ -98,7 +98,7 @@
       <!-- <el-table-column label="删除状态" align="center" prop="delStatus" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button v-if="scope.row.superiorAgentAccount == 'admin'"
+          <el-button v-if="user != 'admin' || scope.row.superiorAgentAccount == 'admin'"
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -211,6 +211,7 @@ export default {
         superiorAgentAccount: null,
         delStatus: "1"
       },
+      user: this.$store.state.user.name,
       // 表单参数
       form: {},
       // 表单校验