From 2b65fa2a67736d4316115ce91c26792f6c0b2377 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 29 七月 2024 17:53:27 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
index a80c6a7..fd91fd6 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
@@ -843,13 +843,12 @@
Shop shop = shopMapper.selectById(users.getDepartmentId());
if(Objects.nonNull(shop)){
users.setShopName(shop.getName());
- if(!(StringUtils.isBlank(shop.getProvinceName())||StringUtils.isBlank(shop.getCityName())||StringUtils.isBlank(shop.getAreaName()))){
- users.setShopCity(shop.getProvinceName()+shop.getCityName()+shop.getAreaName());
- }
if(StringUtils.isNotBlank(shop.getAddress())){
users.setShopAddress(shop.getAddress());
}else{
- users.setShopAddress(shop.getProvinceName()+shop.getCityName()+shop.getAreaName()+shop.getTown()+shop.getRegAddr());
+ if(!(StringUtils.isBlank(shop.getProvinceName())||StringUtils.isBlank(shop.getCityName())||StringUtils.isBlank(shop.getAreaName()))){
+ users.setShopAddress(shop.getProvinceName()+shop.getCityName()+shop.getAreaName());
+ }
}
}
}
--
Gitblit v1.9.3