Changes

Fixiaobai

2023-11-04 958e45e28ca4f591ab13f2c6f4fe27d57c4880d5

 mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/StaffServiceImpl.java

@@ -25,12 +25,13 @@
import com.chinaztt.mes.basic.excel.StaffData;
import com.chinaztt.mes.basic.mapper.*;
import com.chinaztt.mes.basic.service.StaffService;
import com.chinaztt.ztt.common.data.datascope.DataScope;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.Objects;

/**
 * 员工
@@ -40,6 +41,7 @@
 */
@Service
@AllArgsConstructor
@Slf4j
public class StaffServiceImpl extends ServiceImpl<StaffMapper, Staff> implements StaffService {

   private DivisionMapper divisionMapper;
@@ -87,6 +89,13 @@
      List<Company> companies = companyMapper.selectList(null);
      List<Factory> factories = factoryMapper.selectList(null);
      for (StaffData staffData : list) {
         QueryWrapper<Staff> QueryWrapper = new QueryWrapper<>();
         QueryWrapper.lambda().eq(Staff::getStaffNo,staffData.getStaffNo());
         Staff staff1 = baseMapper.selectOne(QueryWrapper);
         if(!Objects.isNull(staff1)){
            log.error("员工编号重复======》"+staffData.getStaffNo());
            continue;
         }
         Staff staff = new Staff();
         BeanUtils.copyProperties(staffData, staff);
         for (int i = 0; i < divisions.size(); i++) {