diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectServiceImpl.java index 6bb630d5..55fa917a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectServiceImpl.java @@ -1,19 +1,17 @@ package org.dromara.xzd.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.domain.R; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.RequiredArgsConstructor; +import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.utils.BatchNumberGenerator; import org.dromara.system.domain.vo.SysDeptVo; -import org.dromara.system.domain.vo.SysOssVo; import org.dromara.system.domain.vo.SysUserVo; import org.dromara.system.service.ISysDeptService; import org.dromara.system.service.impl.SysOssServiceImpl; @@ -22,16 +20,15 @@ import org.dromara.xzd.domain.*; import org.dromara.xzd.domain.bo.*; import org.dromara.xzd.domain.dto.QuerCorrespondentDto; import org.dromara.xzd.domain.vo.*; +import org.dromara.xzd.mapper.XzdProjectMapper; import org.dromara.xzd.service.IXzdCorrespondentList; +import org.dromara.xzd.service.IXzdProjectService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.dromara.xzd.mapper.XzdProjectMapper; -import org.dromara.xzd.service.IXzdProjectService; import org.springframework.transaction.annotation.Transactional; import java.util.*; -import java.util.stream.Collectors; /** * 项目信息Service业务层处理 @@ -279,9 +276,7 @@ public class XzdProjectServiceImpl extends ServiceImpl now = new ArrayList<>(); for (XzdProjectPersonnelBo boValue : bo.getXmry()) { - if (boValue.getId() == null){ - boValue.setXzdProjectId(update.getId()); - } + boValue.setXzdProjectId(update.getId()); XzdProjectPersonnel temp = new XzdProjectPersonnel(); BeanUtils.copyProperties(boValue, temp); now.add(temp);