Merge branch 'fixbug/fixmap' into 'master'

bug: [none] fixBookMap

See merge request rays/pcloud-book!1025

pcloud-service-book/src/main/java/com/pcloud/book/applet/biz/impl/SpecialBookBizImpl.java

@@ -181,7 +181,7 @@ public class SpecialBookBizImpl implements SpecialBookBiz {
         for (SpecialBookDTO specialBookDTO : specialBookDTOS) {
             if (null != specialBookDTO.getAdviserId() && null != adviserNameMap.get(specialBookDTO.getAdviserId())) {
                 specialBookDTO.setAdviserName(adviserNameMap.get(specialBookDTO.getAdviserId()));
-                specialBookDTO.setAgentName(agentMap.get(specialBookDTO.getAdviserId()).getName());
+                specialBookDTO.setAgentName(null != agentMap.get(specialBookDTO.getAgentId()) ? agentMap.get(specialBookDTO.getAgentId()).getName() : "");
             }
             if (null != specialBookDTO.getChannelId() && null != channelNameMap.get(specialBookDTO.getChannelId())) {
                 specialBookDTO.setChannelName(channelNameMap.get(specialBookDTO.getChannelId()));

pcloud-service-book/src/main/resources/mapper/record/BookBrowseRecordMapper.xml

@@ -34,7 +34,7 @@
   </select>
   <select id="getBookCount4Country" resultType="com.pcloud.book.record.entity.BookMapStatistics" parameterType="map">
     select
-    count((book_adviser_id)) bookCount,
+    count(distinct book_adviser_id) bookCount,
     province,
     province_code provinceCode,
     city,
@@ -64,7 +64,7 @@
     select
     (case when #{areaCode} = 1 then province_code when #{areaCode} = 2 then city_code  else 0 end) regionCode,
     (case when #{areaCode} = 1 then province when #{areaCode} = 2 then city when #{areaCode} = 0  then '全国' end) regionName ,
-    count((book_adviser_id))  bookCount
+    count(distinct book_adviser_id)  bookCount
     from  book_browse_record b
     <where>
       <choose>
@@ -87,7 +87,7 @@
     select
     IFNULL(book_classify_id,0) classifyId,
     IFNULL(a.classify_name,"其他分类") classifyName,
-    count((book_adviser_id))  bookCount
+    count(distinct book_adviser_id)  bookCount
     from
     book_browse_record b
     left join applet_book_classify a