java110 лет назад: 4
Родитель
Сommit
1027cd75c4

+ 8 - 7
service-api/src/main/java/com/java110/api/listener/login/UserLoginServiceListener.java

@@ -10,7 +10,6 @@ import com.java110.core.factory.DataFlowFactory;
 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.constant.ServiceCodeConstant;
 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 @@ public class UserLoginServiceListener extends AbstractServiceApiDataFlowListener
             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 @@ public class UserLoginServiceListener extends AbstractServiceApiDataFlowListener
                 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();