From 7f49032338115c852faed1781f08eb202db98c12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com>
Date: Mon, 5 Aug 2024 16:01:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E7=94=B3=E8=AF=B7debug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/ss/storeApply/mapper/StoreApplyMapper.xml  | 1 +
 .../storeApply/service/impl/StoreApplyServiceImpl.java   | 2 ++
 .../web/controller/mch/MchStoreApplyController.java      | 9 ++++++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/storeApply/mapper/StoreApplyMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/storeApply/mapper/StoreApplyMapper.xml
index a7b70f8f..c71f4ea9 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/storeApply/mapper/StoreApplyMapper.xml
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/storeApply/mapper/StoreApplyMapper.xml
@@ -61,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <include refid="searchCondition"/>
         </where>
+        limit 1
     </select>
 
     <insert id="insertStoreApply" parameterType="StoreApply" useGeneratedKeys="true" keyProperty="id">
diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/storeApply/service/impl/StoreApplyServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/storeApply/service/impl/StoreApplyServiceImpl.java
index 5798d41b..987eff0f 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/storeApply/service/impl/StoreApplyServiceImpl.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/storeApply/service/impl/StoreApplyServiceImpl.java
@@ -3,6 +3,7 @@ package com.ruoyi.ss.storeApply.service.impl;
 import java.time.LocalDateTime;
 import java.util.List;
 
+import com.github.pagehelper.PageHelper;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.ServiceUtil;
@@ -22,6 +23,7 @@ import com.ruoyi.ss.storeApply.domain.StoreApplyVO;
 import com.ruoyi.ss.storeApply.domain.StoreApplyQuery;
 import com.ruoyi.ss.storeApply.service.StoreApplyService;
 import org.springframework.transaction.support.TransactionTemplate;
+import org.springframework.util.CollectionUtils;
 
 /**
  * 店铺审核Service业务层处理
diff --git a/smart-switch-web/src/main/java/com/ruoyi/web/controller/mch/MchStoreApplyController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/mch/MchStoreApplyController.java
index 371a62c2..e4b3c9e4 100644
--- a/smart-switch-web/src/main/java/com/ruoyi/web/controller/mch/MchStoreApplyController.java
+++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/mch/MchStoreApplyController.java
@@ -13,9 +13,11 @@ import com.ruoyi.ss.storeApply.service.StoreApplyValidator;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Collections;
+import java.util.List;
 
 /**
  * @author wjh
@@ -42,9 +44,14 @@ public class MchStoreApplyController extends BaseController {
             return error("这不是您的店铺");
         }
         PageHelper.orderBy(" create_time desc ");
+        PageHelper.startPage(1, 1);
         StoreApplyQuery query = new StoreApplyQuery();
         query.setStoreId(storeId);
-        return success(storeApplyService.selectOne(query));
+        List<StoreApplyVO> list = storeApplyService.selectStoreApplyList(query);
+        if (CollectionUtils.isEmpty(list)) {
+            return success();
+        }
+        return success(list.get(0));
     }
 
     @ApiOperation("取消申请")