From f4a69a925645fe0c84121fde76ec03aff1b07939 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 14 一月 2025 11:24:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java
index 30827ae..68b621e 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java
@@ -93,7 +93,7 @@
}
Shop shop = shopMapper.selectById(appUser.getShopId());
- if(null != shop){
+ if(null != shop && shop.getDelFlag() == 0 && shop.getStatus() == 1){
NearbyShopVO vo = new NearbyShopVO();
vo.setId(appUser.getShopId().longValue());
vo.setName(shop.getName());
--
Gitblit v1.7.1