Merge branch 'master-bug-0418' into dev-test

# Conflicts:
#	src/main/java/com/zfxftech/telmarket/service/impl/business/asset/AssetStockPositionServiceImpl.java

src/main/java/com/zfxftech/telmarket/service/impl/business/asset/AssetStockPositionServiceImpl.java

@@ -18,6 +18,7 @@ import com.zfxftech.telmarket.common.pojo.dao.*;
 import com.zfxftech.telmarket.common.pojo.dao.asset.*;
 import com.zfxftech.telmarket.common.pojo.dao.permission.UsAdmin;
 import com.zfxftech.telmarket.common.pojo.dao.permission.UsTeamUser;
+import com.zfxftech.telmarket.common.pojo.dao.survey.SurveyStockPosition;
 import com.zfxftech.telmarket.common.pojo.dto.account.DataAuthorityDto;
 import com.zfxftech.telmarket.common.pojo.dto.remind.StockPositionTask;
 import com.zfxftech.telmarket.common.pojo.message.bo.TradingStrategyBO;
@@ -1368,11 +1369,16 @@ public class AssetStockPositionServiceImpl extends ServiceImpl<AssetStockPositio
 
         AssetMarketDetailsVO marketDetailsVO = new AssetMarketDetailsVO();
 
-        List<String> codes = stockPositions.stream().map(AssetStockPosition::getCode).collect(Collectors.toList());
-        //批量获取股票当前价格
-        Map<String, Quote> codeAndPriceMapping = stockCodeService.batchQueryStockPrice(codes);
-        //计算股票总市值（当前）
-        BigDecimal stocksTotalPrice = assetFinanceCalculateService.calculateTotalAssets(stockPositions, codeAndPriceMapping);
+       BigDecimal stocksTotalPrice = new BigDecimal("0");
+       if(!ObjectUtils.isEmpty(stockPositions)){
+           List<String> codes = stockPositions.stream().map(AssetStockPosition::getCode).collect(Collectors.toList());
+           //批量获取股票当前价格
+           Map<String, Quote> codeAndPriceMapping = stockCodeService.batchQueryStockPrice(codes);
+           //计算股票总市值（当前）
+           stocksTotalPrice = assetFinanceCalculateService.calculateTotalAssets(stockPositions, codeAndPriceMapping);
+       }
+
+
         //计算总值
         BigDecimal totalPrice = BigDecimalUtil.add(funding, stocksTotalPrice);
         //计算仓位