From f1466547af2fb4c616f78de0b34286556e7432b2 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Fri, 12 Apr 2024 23:50:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=B8=8A=E6=B5=8B=E8=AF=95=20=E5=88=86?=
 =?UTF-8?q?=E5=B8=83=E5=BC=8F=E4=BA=8B=E7=89=A92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/logpm/basicdata/BasicDataApplication.java    | 2 ++
 .../service/impl/BasicdataWarehouseServiceImpl.java       | 8 ++++++++
 .../java/com/logpm/trunkline/TrunkLineApplication.java    | 3 +++
 3 files changed, 13 insertions(+)

diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java
index ed76ab91b..5debe9193 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java
@@ -13,7 +13,9 @@ import org.springblade.core.cloud.feign.EnableBladeFeign;
  *
  * @author lmy
  */
+@EnableBladeFeign
 @SeataCloudApplication
+
 public class BasicDataApplication {
 
 	public static void main(String[] args) {
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java
index 9e6dd9fd9..98611fe75 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java
@@ -169,12 +169,19 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWare
 
 			String defaultRoleId = DictBizCache.getValue(DictBizConstant.DEFAULT_MALL_ROLE_ID, DictBizConstant.DEFAULT_MALL_ROLE_ID);
 
+
+			if(StringUtil.isBlank(defaultRoleId)){
+				defaultRoleId="1111";
+			}
+
 			log.info(">>>>>>> 当前登录的人 {} 角色信息 {}",user.getAccount(),user.getRoleId());
 			// 最大的管理员
 			if (ObjectUtil.isEmpty(user.getRoleId())) {
 				return null;
 			}
 
+			log.info(">>>>1 {}",user.getRoleId());
+			log.info(">>>>2 {}",defaultRoleId);
 			if (user.getRoleId().contains(defaultRoleId)) {
 
 				// 当前这登录的用户为商场用户
@@ -265,6 +272,7 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWare
 		// 根据当前登陆人的信息和角色判断查询是所属仓库 还是服务仓库
 		try {
 			BladeUser user = AuthUtil.getUser();
+
 			String json = redis.get(CacheNames.tenantKeyObj(user.getTenantId(), CacheNames.USER_WAREHOUSE_KEY, user.getUserId()));
 			if (StringUtil.isBlank(json)) {
 				List<BasicdataWarehouseEntity> myWarehouseList = getMyWarehouseList();
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/TrunkLineApplication.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/TrunkLineApplication.java
index 3fe5da099..d4ce0a6b7 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/TrunkLineApplication.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/TrunkLineApplication.java
@@ -17,14 +17,17 @@
 package com.logpm.trunkline;
 
 import org.springblade.common.constant.ModuleNameConstant;
+import org.springblade.core.cloud.feign.EnableBladeFeign;
 import org.springblade.core.launch.BladeApplication;
 import org.springblade.core.transaction.annotation.SeataCloudApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 
 /**
  * Demo启动器
  *
  * @author Chill
  */
+@EnableBladeFeign
 @SeataCloudApplication
 public class TrunkLineApplication {