From 1a5f7432c404946f9ec358b5cb6281a823c466c1 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 14 一月 2025 16:55:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
index 443d1e8..138fa96 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
@@ -219,9 +219,10 @@
         // 查询有没有门店绑定这个被删除的门店
         List<Shop> shops = shopService.lambdaQuery().eq(Shop::getPid, shop.getId()).list();
         for (Shop shop1 : shops) {
-            shop1.setPid(0);
+            LambdaUpdateWrapper<Shop> set = new LambdaUpdateWrapper<Shop>().set(Shop::getPid, null)
+                    .eq(Shop::getId,shop1.getId());
+            shopService.update(set);
         }
-        shopService.updateBatchById(shops);
         appUserClient.clearBindShop(shop.getId());
         UserShop userShop = new UserShop();
         userShop.setShopId(shop.getId());

--
Gitblit v1.7.1