|
|
|
@ -18,9 +18,9 @@ package org.springblade.auth.service;
|
|
|
|
|
|
|
|
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
|
|
import com.alibaba.nacos.common.utils.StringUtils; |
|
|
|
|
import com.logpm.basicdata.entity.BasicdataWarehouseEntity; |
|
|
|
|
import com.logpm.basicdata.entity.WarehouseParcelListEntity; |
|
|
|
|
import com.logpm.basicdata.feign.IBasicdataWarehouseClient; |
|
|
|
|
//import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
|
|
|
|
|
//import com.logpm.basicdata.entity.WarehouseParcelListEntity;
|
|
|
|
|
//import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
|
|
|
|
|
import io.jsonwebtoken.Claims; |
|
|
|
|
import lombok.AllArgsConstructor; |
|
|
|
|
import lombok.SneakyThrows; |
|
|
|
@ -70,7 +70,7 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
|
|
|
|
|
private final BladeRedis bladeRedis; |
|
|
|
|
private final JwtProperties jwtProperties; |
|
|
|
|
|
|
|
|
|
private final IBasicdataWarehouseClient basicdataWarehouseClient; |
|
|
|
|
// private final IBasicdataWarehouseClient basicdataWarehouseClient;
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
@SneakyThrows |
|
|
|
@ -163,11 +163,11 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
|
|
|
|
|
|
|
|
|
|
// 绑定仓库
|
|
|
|
|
try { |
|
|
|
|
BasicdataWarehouseEntity bls = basicdataWarehouseClient.addWarehouseSingle(user.getDeptId(), user.getTenantId(), user.getId()); |
|
|
|
|
if (ObjectUtil.isNotEmpty(bls)) { |
|
|
|
|
userInfo.getDetail().put("warehouse_id", bls.getId()); |
|
|
|
|
userInfo.getDetail().put("warehouse_name", bls.getName()); |
|
|
|
|
} |
|
|
|
|
// BasicdataWarehouseEntity bls = basicdataWarehouseClient.addWarehouseSingle(user.getDeptId(), user.getTenantId(), user.getId());
|
|
|
|
|
// if (ObjectUtil.isNotEmpty(bls)) {
|
|
|
|
|
// userInfo.getDetail().put("warehouse_id", bls.getId());
|
|
|
|
|
// userInfo.getDetail().put("warehouse_name", bls.getName());
|
|
|
|
|
// }
|
|
|
|
|
} catch ( Exception e) { |
|
|
|
|
log.error("登录获取仓库信息报错 {}", e.getMessage()); |
|
|
|
|
} |
|
|
|
|