Merge branch 'fixbug/fixnull' into 'master'

bug:[none] fixnull

See merge request rays/pcloud-book!1106

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

@@ -1055,8 +1055,10 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
                 rightsSettingBookRelation.setIsbn(bookDtoMap.get(rightsSettingBookRelation.getBookId()).getIsbn());
             }
             if (MapUtils.isNotEmpty(infoDtoMap) && null != infoDtoMap.get(rightsSettingBookRelation.getAdviserId())) {
-                rightsSettingBookRelation.setAdviserName(infoDtoMap.get(rightsSettingBookRelation.getAdviserId()).getPartyName());
-                rightsSettingBookRelation.setAgentName(infoDtoMap.get(rightsSettingBookRelation.getAdviserId()).getAgentName());
+                if (null != infoDtoMap.get(rightsSettingBookRelation.getAdviserId())) {
+                    rightsSettingBookRelation.setAdviserName(infoDtoMap.get(rightsSettingBookRelation.getAdviserId()).getPartyName());
+                    rightsSettingBookRelation.setAgentName(infoDtoMap.get(rightsSettingBookRelation.getAdviserId()).getAgentName());
+                }
             }
         }
         rightsSetting.setRightsSettingBookRelations(rightsSettingBookRelations);
@@ -2114,8 +2116,10 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
                 return;
             }
             rightsSettingBookRelations.stream().forEach(rightsSettingBookRelation -> {
-                rightsSettingBookRelation.setAdviserName(infoDtoMap.get(rightsSettingBookRelation.getAdviserId()).getPartyName());
-                rightsSettingBookRelation.setAgentName(infoDtoMap.get(rightsSettingBookRelation.getAdviserId()).getAgentName());
+                if (null != infoDtoMap.get(rightsSettingBookRelation.getAdviserId())) {
+                    rightsSettingBookRelation.setAdviserName(infoDtoMap.get(rightsSettingBookRelation.getAdviserId()).getPartyName());
+                    rightsSettingBookRelation.setAgentName(infoDtoMap.get(rightsSettingBookRelation.getAdviserId()).getAgentName());
+                }
             });
         });
     }