Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-data-cloud into developer

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

@@ -275,9 +275,11 @@ public class GoDownComponent {
                     if(clerkDtoMap != null && level.intValue() == clerkLevel){
                         ClerkDTO clerkDTO = clerkDtoMap.get(baseSalesDTO.getAreaId() == null ? Integer.valueOf(baseSalesDTO.getId()) : Integer.valueOf(baseSalesDTO.getAreaId()));
                         if(clerkDTO != null){
+                            baseSalesDTO.setAreaName(clerkDTO.getClerkName());
                             baseSalesDTO.setName(clerkDTO.getClerkName());
                         }else{
                             baseSalesDTO.setName("未知");
+                            baseSalesDTO.setAreaName("未知");
                         }
                     }
                 });