Merge branch 'feat-1001923' into 'master'

修改标签bug

See merge request rays/pcloud-book!258

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

@@ -3491,16 +3491,19 @@ public class BookGroupBizImpl implements BookGroupBiz {
             if (!agentIds.contains(selfBookGroupStDTO.getAgentId())){
                 agentIds.add(selfBookGroupStDTO.getAgentId());
             }
-            if (!labelIds.contains(selfBookGroupStDTO.getDepLabelId())){
+            if (!labelIds.contains(selfBookGroupStDTO.getDepLabelId()) && selfBookGroupStDTO.getDepLabelId() != null) {
                 labelIds.add(selfBookGroupStDTO.getDepLabelId());
             }
-            if (!labelIds.contains(selfBookGroupStDTO.getPurLabelId())){
+            if (!labelIds.contains(selfBookGroupStDTO.getPurLabelId()) && selfBookGroupStDTO.getPurLabelId() != null) {
                 labelIds.add(selfBookGroupStDTO.getPurLabelId());
             }
         }
         Map<Long, String> adviserNamesMap = adviserConsr.getNames(adviserIds);
         Map<Long, String> agentNamesMap = agentConsr.getNames(agentIds);
-        Map<Long, String> labelMap = ResponseHandleUtil.parseMap(labelService.getLabelName(labelIds), Long.class, String.class);
+        Map<Long, String> labelMap = new HashMap<>();
+        if (!ListUtils.isEmpty(labelIds)) {
+            labelMap = ResponseHandleUtil.parseMap(labelService.getLabelName(labelIds), Long.class, String.class);
+        }
         for (SelfBookGroupStDTO selfBookGroupStDTO:list){
             selfBookGroupStDTO.setAdviserName(adviserNamesMap.get(selfBookGroupStDTO.getAdviserId()));
             selfBookGroupStDTO.setAgentName(agentNamesMap.get(selfBookGroupStDTO.getAgentId()));