Commit 1a92e3e8 authored by Quxl's avatar Quxl

x

parent 561c99b0
...@@ -373,7 +373,9 @@ public class GoodsServiceImpl implements GoodsService { ...@@ -373,7 +373,9 @@ public class GoodsServiceImpl implements GoodsService {
String sql = "select * from tAgentContractGoods where sAgentContractNO = ? and nGoodsID = ?"; String sql = "select * from tAgentContractGoods where sAgentContractNO = ? and nGoodsID = ?";
Map<String, Object> detail = jdbcTemplate.queryForMap(sql, contractNo, goodsId); Map<String, Object> detail = jdbcTemplate.queryForMap(sql, contractNo, goodsId);
Map<String, List<Map<String, Object>>> picList = goodsPicList(goodsId, contractNo); Map<String, List<Map<String, Object>>> picList = goodsPicList(goodsId, contractNo);
return Rjx.jsonOk().set("goodsDetail", detail).set("imgGroup", picList).toJson(); Rjx rjx = Rjx.jsonOk().set("goodsDetail", detail);
rjx.putAll(picList);
return rjx.toJson();
} }
...@@ -400,7 +402,7 @@ public class GoodsServiceImpl implements GoodsService { ...@@ -400,7 +402,7 @@ public class GoodsServiceImpl implements GoodsService {
if(picList == null || picList.size() == 0) { if(picList == null || picList.size() == 0) {
picList = picML2.get(sPicTypeID); picList = picML2.get(sPicTypeID);
} }
pics.put(sPicTypeID, picList); pics.put("ImgGroup_" + sPicTypeID, picList);
} }
return pics; return pics;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment