diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java index 04e3946f..0c88d87d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java @@ -23,6 +23,7 @@ import com.adc.da.slrs.wgWorkGroup.dao.WgWorkGroupDao; import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupDTO; import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupShowDTO; import com.adc.da.slrs.wgWorkGroup.service.IWgWorkGroupService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -333,15 +334,21 @@ public class WgWorkGroupServiceImpl extends ServiceImpl { WgDept wgDept=new WgDept(); BeanUtils.copyProperties(wgDeptShow,wgDept); + if (null==wgDept.getWgId()){ + wgDept.setWgId(wgWorkGroupShowDTO.getId()); + } wgDepts.add(wgDept); }); - flag = wgDeptService.saveOrUpdateBatch(wgDepts); } if (null != wgWorkGroupShowDTO.getWgMeetingInfos() && wgWorkGroupShowDTO.getWgMeetingInfos().size() > 0) { List removeMeet = new ArrayList<>(); List wgMeetingUserRelations = new ArrayList<>(); wgWorkGroupShowDTO.getWgMeetingInfos().forEach(wgMeetingInfo -> { + if (null==wgMeetingInfo.getId()){ + wgMeetingInfo.setId(String.valueOf(UUID.randomUUID())); + wgMeetingInfo.setWgId(wgWorkGroupShowDTO.getId()); + } wgMeetingInfo.getMeetingPeople().forEach(s -> { WgMeetingUserRelation wgMeetingUserRelation = new WgMeetingUserRelation(); wgMeetingUserRelation.setUserId(s); @@ -350,27 +357,42 @@ public class WgWorkGroupServiceImpl extends ServiceImpl 0) { List wgNetInfos = new ArrayList<>(); wgWorkGroupShowDTO.getWgNetInfos().forEach(wgNetInfoDTO -> { WgNetInfo wgNetInfo = new WgNetInfo(); BeanUtils.copyProperties(wgNetInfoDTO, wgNetInfo); + if (null==wgNetInfo.getWgId()){ + wgNetInfo.setWgId(wgWorkGroupShowDTO.getId()); + } wgNetInfos.add(wgNetInfo); }); flag = wgNetInfoService.saveOrUpdateBatch(wgNetInfos); } if (null != wgWorkGroupShowDTO.getWgPayInfos() && wgWorkGroupShowDTO.getWgPayInfos().size() > 0) { + if (!wgWorkGroupShowDTO.getWgPayInfos().isEmpty()){ + wgWorkGroupShowDTO.getWgPayInfos().forEach(wgPayInfo -> { + if (null==wgPayInfo.getWgId()){ + wgPayInfo.setWgId(wgWorkGroupShowDTO.getId()); + } + }); + } flag = wgPayInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgPayInfos()); } if (null != wgWorkGroupShowDTO.getWgStandorpolicyInfos() && wgWorkGroupShowDTO.getWgStandorpolicyInfos().size() > 0) { + if (!wgWorkGroupShowDTO.getWgStandorpolicyInfos().isEmpty()){ + wgWorkGroupShowDTO.getWgStandorpolicyInfos().forEach(wgStandorpolicyInfo -> { + if (null==wgStandorpolicyInfo.getWgId()){ + wgStandorpolicyInfo.setWgId(wgWorkGroupShowDTO.getId()); + } + }); + } flag = wgStandorpolicyInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgStandorpolicyInfos()); }