Skip to content

M
midjourney-proxy
Commit e7145230 by 田超
Options

Merge branch 'fixbug/fixnull' into 'master' 

bug:[none] fixnull

See merge request rays/pcloud-book!1106
parents 7fdc5be6 4890575c
Showing with 8 additions and 4 deletions
pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/biz/impl/RightsSettingBizImpl.java
...@@ -1055,8 +1055,10 @@ public class RightsSettingBizImpl implements RightsSettingBiz { ...@@ -1055,8 +1055,10 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
rightsSettingBookRelation.setIsbn(bookDtoMap.get(rightsSettingBookRelation.getBookId()).getIsbn()); rightsSettingBookRelation.setIsbn(bookDtoMap.get(rightsSettingBookRelation.getBookId()).getIsbn());
} }
if (MapUtils.isNotEmpty(infoDtoMap) && null != infoDtoMap.get(rightsSettingBookRelation.getAdviserId())) { if (MapUtils.isNotEmpty(infoDtoMap) && null != infoDtoMap.get(rightsSettingBookRelation.getAdviserId())) {
rightsSettingBookRelation.setAdviserName(infoDtoMap.get(rightsSettingBookRelation.getAdviserId()).getPartyName()); if (null != infoDtoMap.get(rightsSettingBookRelation.getAdviserId())) {
rightsSettingBookRelation.setAgentName(infoDtoMap.get(rightsSettingBookRelation.getAdviserId()).getAgentName()); rightsSettingBookRelation.setAdviserName(infoDtoMap.get(rightsSettingBookRelation.getAdviserId()).getPartyName());
rightsSettingBookRelation.setAgentName(infoDtoMap.get(rightsSettingBookRelation.getAdviserId()).getAgentName());
}
} }
} }
rightsSetting.setRightsSettingBookRelations(rightsSettingBookRelations); rightsSetting.setRightsSettingBookRelations(rightsSettingBookRelations);
...@@ -2114,8 +2116,10 @@ public class RightsSettingBizImpl implements RightsSettingBiz { ...@@ -2114,8 +2116,10 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
return; return;
} }
rightsSettingBookRelations.stream().forEach(rightsSettingBookRelation -> { rightsSettingBookRelations.stream().forEach(rightsSettingBookRelation -> {
rightsSettingBookRelation.setAdviserName(infoDtoMap.get(rightsSettingBookRelation.getAdviserId()).getPartyName()); if (null != infoDtoMap.get(rightsSettingBookRelation.getAdviserId())) {
rightsSettingBookRelation.setAgentName(infoDtoMap.get(rightsSettingBookRelation.getAdviserId()).getAgentName()); rightsSettingBookRelation.setAdviserName(infoDtoMap.get(rightsSettingBookRelation.getAdviserId()).getPartyName());
rightsSettingBookRelation.setAgentName(infoDtoMap.get(rightsSettingBookRelation.getAdviserId()).getAgentName());
}
}); });
}); });
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment