Merge branch 'fixbug/1025712' into 'master'

bug: [1025712] 书刊管理-编辑添加书刊出版社和运营平台取反了，导出的表格没有出版社信息

See merge request rays/pcloud-book!973

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

@@ -1380,9 +1380,9 @@ public class BookBizImpl implements BookBiz {
             bookSet.setTemplateNameNew(pageBean.getRecordList());
             // 设置运营平台名称
             bookSet.setChannelInfoList(pageBean.getRecordList());
-            // 设置出版社名称
+            // 设置出版社名称 避免循环调接口
             bookSet.setAgentId4BookDto(pageBean.getRecordList());
-            bookSet.setAgentName4BookDto(pageBean.getRecordList());
+            //bookSet.setAgentName4BookDto(pageBean.getRecordList());
             // 设置图书收益
             bookSet.setBookIncome(pageBean.getRecordList());
             // 设置编辑账户信息

pcloud-service-book/src/main/java/com/pcloud/book/book/set/BookSet.java

@@ -3,6 +3,7 @@
  */
 package com.pcloud.book.book.set;
 
+import cn.hutool.core.collection.CollUtil;
 import com.google.common.collect.Lists;
 
 import com.alibaba.fastjson.JSONObject;
@@ -304,12 +305,21 @@ public class BookSet {
      * 批量填充出版ID
      */
     public void setAgentId4BookDto(List<Object> objects) {
-        for (Object object : objects) {
-            BookDto bookDto = (BookDto) object;
-            Long adviserId = bookDto.getAdviserId();
-            if (null != adviserId) {
-                Long agentId = adviserConsr.getAgentIdByAdviser(adviserId);
-                bookDto.setAgentId(agentId);
+        if (CollUtil.isEmpty(objects)) {
+            return;
+        }
+        List<Long> adviserIds = objects.stream().map(x -> ((BookDto) x).getAdviserId()).collect(Collectors.toList());
+        if (CollUtil.isNotEmpty(adviserIds)) {
+            Map<Long, AdviserBaseInfoDto> map = adviserConsr.getAdviserId2AdviserInfoDtoMap(adviserIds);
+            if (CollUtil.isNotEmpty(map)) {
+                objects.forEach(x -> {
+                    BookDto x1 = (BookDto) x;
+                    AdviserBaseInfoDto dto = map.get(x1.getAdviserId());
+                    if (Objects.nonNull(dto)) {
+                        x1.setAgentId(dto.getAgentId());
+                        x1.setAgentName(dto.getAgentName());
+                    }
+                });
             }
         }
     }
@@ -1528,8 +1538,8 @@ public class BookSet {
             objs[4] = ((bookDto.getAdviserName() == null || "".equals(bookDto.getAdviserName().trim())) ? "-"
                     : bookDto.getAdviserName());
             // 出版社
-            objs[5] = ((bookDto.getPublish() == null || "".equals(bookDto.getPublish().trim())) ? "-"
-                    : bookDto.getPublish());
+            objs[5] = ((bookDto.getAgentName() == null || "".equals(bookDto.getAgentName().trim())) ? "-"
+                    : bookDto.getAgentName());
             // 添加时间
             objs[6] = bookDto.getCreatedDate() == null ? "-"
                     : DateUtils.getStrFormTime("yyyy/M/d H:m", bookDto.getCreatedDate());