培训 - 在线学习bugfix

master/src/main/java/com/ruoyi/project/training/elearn/controller/TElResourceController.java

@@ -54,10 +54,14 @@ public class TElResourceController extends BaseController
             TElLearn learn = new TElLearn();
             learn.setUserId(userId);
             learn.setResourceId(elResource.getId());
-            elResource.setLearnTime(itElLearnService.selectLearnByUserIdAndResourceId(learn).getLearnTime());
+            TElLearn learn1 = itElLearnService.selectLearnByUserIdAndResourceId(learn);
+            if (learn1 != null) {
+                elResource.setLearnTime(learn1.getLearnTime());
+
+}
         }
-        return getDataTable(list);
-    }
+                return getDataTable(list);
+                }
 
     /**
      * 查询学习资料管理列表

ui/src/views/training/elearn/learn/index.vue

@@ -27,7 +27,7 @@
       <el-table-column label="文件名" align="center" prop="fileName" :show-overflow-tooltip="true"/>
       <el-table-column label="累计学习时长" align="center" prop="learnTime" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <span>{{ scope.row.learnTime }}</span> min
+          <span v-if="scope.row.learnTime">{{ scope.row.learnTime }} min</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" fixed="right" width="240" class-name="small-padding fixed-width">