Skip to content

Commit

Permalink
Merge pull request #962 from lecjy/feature/955
Browse files Browse the repository at this point in the history
  • Loading branch information
hailiang-wang committed Nov 5, 2023
2 parents 3477f7a + b3c0daa commit c74018a
Showing 1 changed file with 4 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,10 @@ public ModelAndView index(ModelMap map, HttpServletRequest request, String useri

}

agentUserContactsRes.findOneByUserid(
userid).ifPresent(p -> {
map.put("contacts", contactsRes.findById(p.getContactsid()).orElse(null));
agentUserContactsRes.findOneByUserid(userid).ifPresent(p -> {
if (p.getContactsid() != null) {
map.put("contacts", contactsRes.findById(p.getContactsid()).orElse(null));
}
});
AgentService service = agentServiceRes.findById(agentservice).orElse(null);
if (service != null) {
Expand Down

0 comments on commit c74018a

Please sign in to comment.