zdjd 关联的装置级培训的代码和名称关联修改3.0

master/src/main/java/com/ruoyi/project/training/controller/TWorkcertificateController.java

@@ -162,13 +162,18 @@ public class TWorkcertificateController extends BaseController
         List<SysDictData> classes = iSysDictTypeService.selectDictDataByType("CLASSES");
         //部门查询
         List<SysDept> dept = iSysDeptService.selectDeptList(new SysDept());
-        int rowNum = sheet.getPhysicalNumberOfRows();
+        int rowNum = sheet.getLastRowNum();
         int failNumber = 0;
-        for (int i = 1; i < rowNum; i++) {
+        for (int i = 1; i <= rowNum; i++) {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
              //   int cellNum = row.getPhysicalNumberOfCells();
+                if(row==null){
+                    sheet.removeRow(row);
+                    i--;
+                    continue;
+                }
                 int cellNum = row.getLastCellNum();
                 TWorkcertificate entity = new TWorkcertificate();
                 for (int j = 0; j < cellNum; j++) {

ui/src/views/training/workcertificate/index.vue

@@ -379,7 +379,7 @@
         <form ref="downloadFileForm" :action="upload.downloadAction" target="FORMSUBMIT">
           <input name="type" :value="upload.type" hidden />
         </form>
-        <div class="el-upload__tip" style="color:red" slot="tip">{{ $t('提示：仅允许导入“xls”或“xlsx”格式文件！') }}</div>
+        <div class="el-upload__tip" style="color:red" slot="tip">{{ $t('提示：仅允许导入“xls”或“xlsx”格式文件！请将需要上传的数据放在模板excel文件中，并将模板文件的空白行与无关数据删除,谢谢！') }}</div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitFileForm">{{ $t('确 定') }}</el-button>