Merge branch 'dev' into pre-production

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java

@@ -249,7 +249,7 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWare
 		BladeUser user = AuthUtil.getUser();
 		String json = redis.get(CacheNames.tenantKeyObj(user.getTenantId(), CacheNames.USER_WAREHOUSE_KEY, user.getUserId()));
 		if (StringUtil.isBlank(json)) {
-			return null;
+			return getMyWarehouseList(user.getDeptId(),user.getTenantId(),user.getUserId());
 		}
 		BasicdataWarehouseEntity o = JSONObject.parseObject(json, BasicdataWarehouseEntity.class);
 		return o;