diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java index c88d9db8..7f949639 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java @@ -46,10 +46,17 @@ public class SafetyCenterSubitemService extends ServiceImpl 0){ throw new JeroBootException("成员单位已经存在"); } + //判重,联系人是否重复 + List contactsList = safetyCenterSubitem.getContactsList(); + if (!contactsList.isEmpty()){ + List collect = contactsList.stream().map(SafetyCenterSubitemContacts::getContactsId).distinct().collect(Collectors.toList()); + if (collect.size() != contactsList.size()){ + throw new JeroBootException("企业联系人重复"); + } + } this.save(safetyCenterSubitem); //保存成员单位联系人 String subitemId = safetyCenterSubitem.getId(); - List contactsList = safetyCenterSubitem.getContactsList(); for (SafetyCenterSubitemContacts contacts : contactsList) { contacts.setProjectId(projectId); contacts.setCompanyId(companyId); @@ -75,13 +82,20 @@ public class SafetyCenterSubitemService extends ServiceImpl 0){ throw new JeroBootException("成员单位已经存在"); } + //判重,联系人是否重复 + List contactsList = safetyCenterSubitem.getContactsList(); + if (!contactsList.isEmpty()){ + List collect = contactsList.stream().map(SafetyCenterSubitemContacts::getContactsId).distinct().collect(Collectors.toList()); + if (collect.size() != contactsList.size()){ + throw new JeroBootException("企业联系人重复"); + } + } this.updateById(safetyCenterSubitem); //先删除之前保存的 LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); wrapper1.eq(SafetyCenterSubitemContacts::getSubitemId,subitemId); contactsService.remove(wrapper1); //保存成员单位联系人 - List contactsList = safetyCenterSubitem.getContactsList(); for (SafetyCenterSubitemContacts contacts : contactsList) { contacts.setProjectId(projectId); contacts.setCompanyId(companyId);