From d0b043b8fa5f19d1295cac50fece0c65fceb3920 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 17 一月 2025 17:02:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserShopController.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserShopController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserShopController.java
index ecc3f7e..40d20b5 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserShopController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserShopController.java
@@ -52,13 +52,16 @@
      */
     @PostMapping("/delAppUserShop")
     public R delAppUserShop(@RequestBody AppUserShop appUserShop){
-        LambdaUpdateWrapper<AppUserShop> wrapper = new LambdaUpdateWrapper<>();
+        LambdaQueryWrapper<AppUserShop> wrapper = new LambdaQueryWrapper<>();
         if(null != appUserShop.getAppUserId()){
             wrapper.eq(AppUserShop::getAppUserId, appUserShop.getAppUserId());
         }
         if(null != appUserShop.getShopId()){
             wrapper.eq(AppUserShop::getShopId, appUserShop.getShopId());
         }
+        if(null != appUserShop.getRoleType()){
+            wrapper.eq(AppUserShop::getRoleType, appUserShop.getRoleType());
+        }
         appUserShopService.remove(wrapper);
         return R.ok();
     }

--
Gitblit v1.7.1