From 093b73aadb022895a02dbbcd64b87613e19b547b Mon Sep 17 00:00:00 2001
From: 1098226878@qq.com <1098226878@qq.com>
Date: 星期一, 10 一月 2022 18:05:21 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/listener/login/UserLoginServiceListener.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/listener/login/UserLoginServiceListener.java b/service-api/src/main/java/com/java110/api/listener/login/UserLoginServiceListener.java
index 6a8d936..bc81264 100755
--- a/service-api/src/main/java/com/java110/api/listener/login/UserLoginServiceListener.java
+++ b/service-api/src/main/java/com/java110/api/listener/login/UserLoginServiceListener.java
@@ -10,7 +10,6 @@
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.store.StoreDto;
import com.java110.dto.store.StoreUserDto;
-import com.java110.dto.user.UserDto;
import com.java110.dto.userLogin.UserLoginDto;
import com.java110.entity.center.AppService;
import com.java110.intf.store.IStoreInnerServiceSMO;
@@ -23,7 +22,6 @@
import com.java110.utils.exception.SMOException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
-import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -104,7 +102,7 @@
dataFlowContext.setResponseEntity(responseEntity);
return;
}
- String requestUrl = appService.getUrl() + "?userCode=" + paramInJson.getString("username") + "&pwd=" + paramInJson.getString("passwd")+ "&levelCdTag=1";
+ String requestUrl = appService.getUrl() + "?userCode=" + paramInJson.getString("username") + "&pwd=" + paramInJson.getString("passwd") + "&levelCdTag=1";
HttpHeaders header = new HttpHeaders();
header.add(CommonConstant.HTTP_SERVICE.toLowerCase(), ServiceCodeConstant.SERVICE_CODE_QUERY_USER_LOGIN);
HttpEntity<String> httpEntity = new HttpEntity<String>("", header);
@@ -149,11 +147,14 @@
dataFlowContext.setResponseEntity(responseEntity);
return;
}
+
+ StoreDto storeDto = new StoreDto();
+ storeDto.setStoreId(storeUserDtos.get(0).getStoreId());
+ List<StoreDto> storeDtos = storeInnerServiceSMOImpl.getStores(storeDto);
+ if (storeDtos != null && storeDtos.size() > 0) {
+ userInfo.put("storeType", storeDtos.get(0).getStoreTypeCd());
+ }
}
- StoreDto storeDto = new StoreDto();
- storeDto.setStoreId(storeUserDtos.get(0).getStoreId());
- List<StoreDto> storeDtos = storeInnerServiceSMOImpl.getStores(storeDto);
- userInfo.put("storeType",storeDtos.get(0).getStoreTypeCd());
try {
Map userMap = new HashMap();
--
Gitblit v1.8.0