#

luxiaotao1123

2022-11-07 fa7d999ace7025725433a1a609e7d469c71e6c29

 src/main/java/com/zy/crm/manager/controller/CstmrController.java

@@ -25,7 +25,6 @@
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

@@ -181,7 +180,7 @@
     */
    @PostMapping(value = "/cstmr/excel/import/auth")
    @ManagerAuth(memo = "甲方单位Excel导入")
    @Transactional
//    @Transactional
    public R cstmrExcelImport(MultipartFile file) throws IOException {
        InputStream inStream = file.getInputStream();
        String fileMime = file.getContentType();
@@ -210,7 +209,8 @@
            String uuid = dataFormatter.formatCellValue(row.getCell(0));
            if (!Cools.isEmpty(uuid)) {
                if (cstmrService.selectByUuid(hostId, uuid) != null) {
                    throw new CoolException(uuid + "客户代号已存在，请重新导入");
//                    throw new CoolException(uuid + "客户代号已存在，请重新导入");
                    continue;
                } else {
                    cstmr.setUuid(uuid);
                }