Merge branch 'developer' into 'master'

观云台小程序

See merge request !22

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/GoDownComponent.java

@@ -195,7 +195,7 @@ public class GoDownComponent {
                     clerkDTOS = this.clerkApiService.listClerkByIds(enterpriseId, StringUtils.join(clerkIdList, ",")).getResult();
                     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));
                 page.getResult().stream().forEach(b -> {
                     BaseDTO baseSalesDTO = (BaseDTO) b;
@@ -203,7 +203,7 @@ public class GoDownComponent {
                     baseSalesDTO.setChannel(StoreChannelEnum.OFFLINE.getChannel());
                     baseSalesDTO.setHasChildren(level <= maxLevel ? 1 : 0);
                     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){
                             baseSalesDTO.setName(clerkDTO.getClerkName());
                         }else{