From 1e42b0ded6d805c02a94700a1c1d6f7614b3f0b8 Mon Sep 17 00:00:00 2001
From: wangshuai <daws172839@163.com>
Date: Sat, 13 Jul 2024 19:00:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BD=93=E5=89=8D=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=B8=90=E5=88=86=20admin=E8=B4=A6=E6=88=B7=E6=95=B0?=
 =?UTF-8?q?=E7=BB=84=E8=B6=8A=E7=95=8C=E5=A4=84=E7=90=86=20=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E6=B7=BB=E5=8A=A0=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/controller/BusStoreInfoController.java | 13 +++++++++++--
 ruoyi-ui/src/views/agent/list/index.vue             |  4 ++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreInfoController.java
index c189ee0..517c2e5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreInfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreInfoController.java
@@ -83,10 +83,19 @@ public class BusStoreInfoController extends BaseController {
 
     @GetMapping("/getNowIntegral")
     public AjaxResult getNowIntegral() {
+        String username = SecurityUtils.getLoginUser().getUsername();
+        if("admin".equals(username)){
+            return AjaxResult.success("-");
+        }
         BusAgentInfo info = new BusAgentInfo();
         info.setAgentAccount(SecurityUtils.getLoginUser().getUsername());
-        BusAgentInfo temp = agentInfoService.selectBusAgentInfoList(info).get(0);
-        return AjaxResult.success(temp.getAiDurationBalance());
+        info.setDelStatus("1");
+        List<BusAgentInfo> list = agentInfoService.selectBusAgentInfoList(info);
+        if(list.size() == 1){
+            BusAgentInfo temp = agentInfoService.selectBusAgentInfoList(info).get(0);
+            return AjaxResult.success(temp.getAiDurationBalance());
+        }
+        throw new ServiceException("查询代理人积分异常！");
     }
 
     @ApiOperation("查询店铺信息列表")
diff --git a/ruoyi-ui/src/views/agent/list/index.vue b/ruoyi-ui/src/views/agent/list/index.vue
index 5af8ee5..91968e5 100644
--- a/ruoyi-ui/src/views/agent/list/index.vue
+++ b/ruoyi-ui/src/views/agent/list/index.vue
@@ -133,9 +133,9 @@
             >
               <el-option
                 v-for="dict in deptList"
-                :key="dict.id"
+                :key="dict.deptId"
                 :label="dict.deptName+' ：'+dict.deptId"
-                :value="dict.id"
+                :value="dict.deptId"
               />
             </el-select>
         </el-form-item>