Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java

@@ -874,8 +874,13 @@
      File file1 = new File(excelFileName);
      try {
         file.transferTo(new File(excelFileName));
         mdmIOService.importGroupCode(codeClassifyOid,file1);
         return R.success("操作成功！");
         String excelName=mdmIOService.importGroupCode(codeClassifyOid,file1);
         if(StringUtils.isNotBlank(excelName)) {
            ControllerUtil.writeFileToResponse(response,excelName);
            return   R.fail("集团码导入出现问题，请查看文件");
         }else{
            return R.status(true);
         }
      }catch (Throwable e) {
         logger.error("导入错误",e);
         String errorFile = LocalFileUtil.getDefaultTempFolder() + File.separator + "错误.txt";
@@ -885,7 +890,7 @@
         codeImProtRusultVO.setRedisUuid("");
         codeImProtRusultVO.setFileOid(uuid);
         codeImProtRusultVO.setFilePath(errorFile);
         R r = R.fail("导入失败");
         R r = R.fail("集团码导入失败");
         r.setData(codeImProtRusultVO);
         return r;
      }finally {