Commit 16ab7921 by 陶光胜

观云台小程序

parent 9b8fc061
...@@ -195,7 +195,7 @@ public class GoDownComponent { ...@@ -195,7 +195,7 @@ public class GoDownComponent {
clerkDTOS = this.clerkApiService.listClerkByIds(enterpriseId, StringUtils.join(clerkIdList, ",")).getResult(); clerkDTOS = this.clerkApiService.listClerkByIds(enterpriseId, StringUtils.join(clerkIdList, ",")).getResult();
log.info("clerkDtos:{}", clerkDTOS); log.info("clerkDtos:{}", clerkDTOS);
} }
final Map<String, ClerkDTO> clerkDTOMap = CollectionUtil.toMap(clerkDTOS, "clerkId"); final Map<Integer, ClerkDTO> clerkDTOMap = CollectionUtil.toMap(clerkDTOS, "clerkId");
log.info("clerkDTOMap:{}", JSON.toJSONString(clerkDTOMap)); log.info("clerkDTOMap:{}", JSON.toJSONString(clerkDTOMap));
page.getResult().stream().forEach(b -> { page.getResult().stream().forEach(b -> {
BaseDTO baseSalesDTO = (BaseDTO) b; BaseDTO baseSalesDTO = (BaseDTO) b;
...@@ -203,7 +203,7 @@ public class GoDownComponent { ...@@ -203,7 +203,7 @@ public class GoDownComponent {
baseSalesDTO.setChannel(StoreChannelEnum.OFFLINE.getChannel()); baseSalesDTO.setChannel(StoreChannelEnum.OFFLINE.getChannel());
baseSalesDTO.setHasChildren(level <= maxLevel ? 1 : 0); baseSalesDTO.setHasChildren(level <= maxLevel ? 1 : 0);
if(clerkDTOMap != null && level.intValue() == 8){ if(clerkDTOMap != null && level.intValue() == 8){
ClerkDTO clerkDTO = clerkDTOMap.get(baseSalesDTO.getAreaId() == null ? baseSalesDTO.getId() : baseSalesDTO.getAreaId()); ClerkDTO clerkDTO = clerkDTOMap.get(baseSalesDTO.getAreaId() == null ? Integer.valueOf(baseSalesDTO.getId()) : Integer.valueOf(baseSalesDTO.getAreaId()));
if(clerkDTO != null){ if(clerkDTO != null){
baseSalesDTO.setName(clerkDTO.getClerkName()); baseSalesDTO.setName(clerkDTO.getClerkName());
}else{ }else{
......
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