Merge branch 'feat-1001923' into 'master'

定制出版社空判断

See merge request rays/pcloud-book!256

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

@@ -2986,7 +2986,10 @@ public class BookGroupBizImpl implements BookGroupBiz {
         paramMap.put("agentId", agentId);
         if(isSpecial != null && isSpecial) {
             List<Long> specialAgentIds = wechatGroupConsr.getAllAgentId();
-            paramMap.put("specialAgentIds", CollectionUtils.isEmpty(specialAgentIds) ? null :specialAgentIds);
+            if(CollectionUtils.isEmpty(specialAgentIds)) {
+                specialAgentIds.add(-1L);
+            }
+            paramMap.put("specialAgentIds", specialAgentIds);
         }
         PageBeanNew<AgentStatisticsInfoDTO> pageBeanNew = bookGroupDao.listPageNew(new PageParam(currentPage, numPerPage), paramMap, "getAgentStatisticsInfo");
         if(!CollectionUtils.isEmpty(pageBeanNew.getRecordList())) {
@@ -3003,7 +3006,10 @@ public class BookGroupBizImpl implements BookGroupBiz {
         paramMap.put("agentId", agentId);
         if(isSpecial != null && isSpecial) {
             List<Long> specialAgentIds = wechatGroupConsr.getAllAgentId();
-            paramMap.put("specialAgentIds", CollectionUtils.isEmpty(specialAgentIds) ? null :specialAgentIds);
+            if(CollectionUtils.isEmpty(specialAgentIds)) {
+                specialAgentIds.add(-1L);
+            }
+            paramMap.put("specialAgentIds", specialAgentIds);
         }
         List<AgentStatisticsInfoDTO> agentStatisticsInfoDTOS = bookGroupDao.getAgentStatisticsInfo(paramMap);
         if(CollectionUtils.isEmpty(agentStatisticsInfoDTOS)) {