#

tqs

2022-09-23 d53d5f2a27966324a6bfaf7e8caf520f882c882d

#

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

@@ -181,7 +181,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 +210,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);
                }

 src/main/java/com/zy/crm/manager/entity/Cstmr.java

@@ -309,6 +309,7 @@
                this.type = 2;
                break;
            default:
                this.type = 1;
                break;
        }
    }