From 1dd3558d3ea498644f51a145b853e56601dec60e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 18 十二月 2024 16:58:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopPointServiceImpl.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopPointServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopPointServiceImpl.java
index cfc5e09..98c5dd0 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopPointServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopPointServiceImpl.java
@@ -40,8 +40,10 @@
String shopName = shopPoint.getShopName();
String phone = shopPoint.getPhone();
String shopLeaderName = shopPoint.getShopLeaderName();
+ Integer shopId = shopPoint.getShopId();
List<Integer> shopIds = shopService.listObjs(new LambdaQueryWrapper<Shop>()
.select(Shop::getId)
+ .eq(shopId!=null,Shop::getId,shopId)
.like(StringUtils.isNotEmpty(shopName), Shop::getName, shopName)
.like(StringUtils.isNotEmpty(phone), Shop::getPhone, phone)
.like(StringUtils.isNotEmpty(shopLeaderName), Shop::getShopManager, shopLeaderName))
--
Gitblit v1.7.1