Browse Source

fix:修改开单查询不出来客户报错

visual
pref_mail@163.com 4 months ago
parent
commit
5988d25f2c
  1. 7
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java
  2. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml

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

@ -813,15 +813,18 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
@Override
public List<JSONObject> findListByClientName(String clientName, String linkMan, String linkPhone) {
List<JSONObject> list = new ArrayList<>();
List<ClientInfoVO> ls = baseMapper.findListByClientName(clientName, linkMan, linkPhone);
//把ls中所有元素的clientId放入一个list中
List<Long> clientIds = ls.stream().map(ClientInfoVO::getClientId).collect(Collectors.toList());
if(clientIds.isEmpty()){
return list;
}
List<BasicdataStoreBrandEntity> storeBrandEntities = basicdataStoreBrandService.findListByClientIds(clientIds);
//把storeBrandEntities中所有元素通过clientId分组
Map<Long, List<BasicdataStoreBrandEntity>> collect = storeBrandEntities.stream().collect(Collectors.groupingBy(BasicdataStoreBrandEntity::getClientId));
List<JSONObject> list = new ArrayList<>();
// List<JSONObject> list = new ArrayList<>();
for (ClientInfoVO clientInfoVO : ls) {
Long clientId = clientInfoVO.getClientId();
List<BasicdataStoreBrandEntity> storeBrandEntityList = collect.get(clientId);

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml

@ -600,7 +600,7 @@
and ldsa.type_service =#{param.typeService}
</if>
<if test=" param.idsList != null ">and ldsa.id in
<if test=" param.idsList != null ">and ldsa.id in
<foreach collection="param.idsList" open="(" item="a" close=")" separator=",">
#{a}
</foreach>

Loading…
Cancel
Save