施工交付增加其他录入交付功能

唐耀东

2022-10-12 d1bcbbefab4da603c275ed61d0018a46dbc67d1e

 ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SgIpcServiceImpl.java

@@ -74,9 +74,11 @@
        if (list.size() > 0) {
            throw new ServiceException("MAC重复", HttpStatus.HTTP_PARTIAL);
        }
        SgNvr nvr = nvrMapper.selectById(bo.getNvrId());
        if (!bo.getOrganizationId().equals(nvr.getOrganizationId())) {
            throw new ServiceException("IPC所属单位与所选NVR所属单位不符", HttpStatus.HTTP_PARTIAL);
        if (null != bo.getNvrId()) {
            SgNvr nvr = nvrMapper.selectById(bo.getNvrId());
            if (!bo.getOrganizationId().equals(nvr.getOrganizationId())) {
                throw new ServiceException("IPC所属单位与所选NVR所属单位不符", HttpStatus.HTTP_PARTIAL);
            }
        }
        SgIpc add = BeanUtil.toBean(bo, SgIpc.class);
        validEntityBeforeSave(add);
@@ -97,9 +99,11 @@
        if (list.size() > 0) {
            throw new ServiceException("MAC重复", HttpStatus.HTTP_PARTIAL);
        }
        SgNvr nvr = nvrMapper.selectById(bo.getNvrId());
        if (!bo.getOrganizationId().equals(nvr.getOrganizationId())) {
            throw new ServiceException("IPC所属单位与所选NVR所属单位不符", HttpStatus.HTTP_PARTIAL);
        if (null != bo.getNvrId()) {
            SgNvr nvr = nvrMapper.selectById(bo.getNvrId());
            if (!bo.getOrganizationId().equals(nvr.getOrganizationId())) {
                throw new ServiceException("IPC所属单位与所选NVR所属单位不符", HttpStatus.HTTP_PARTIAL);
            }
        }
        SgIpc update = BeanUtil.toBean(bo, SgIpc.class);
        validEntityBeforeSave(update);