范本库增加演练类型代码提交

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillDictionaryServiceImpl.java

@@ -121,8 +121,9 @@ public class CoreDrillDictionaryServiceImpl extends ServiceImpl<CoreDrillDiction
     @Override
     public CoreDrillDictionaryDetailVo selectCoreDrillDictionaryById(Long id) {
         CoreDrillDictionaryDetailVo coreDrillDictionaryDetailVo = coreDrillDictionaryMapper.selectDetailData(id);
-        coreDrillDictionaryDetailVo.setDrillCategoryName(DictUtils.getDictLabel(DictConstants.CORE_DRILL_CATEGORY, Integer.parseInt(coreDrillDictionaryDetailVo.getDrillCategory())));
-
+        if (ObjectUtil.isNotEmpty(coreDrillDictionaryDetailVo.getDrillCategory())){
+            coreDrillDictionaryDetailVo.setDrillCategoryName(DictUtils.getDictLabel(DictConstants.CORE_DRILL_CATEGORY, Integer.parseInt(coreDrillDictionaryDetailVo.getDrillCategory())));
+        }
         return coreDrillDictionaryDetailVo;
     }
 

soc-modules/soc-modules-core/src/main/resources/mapper/drill/CoreDrillDictionaryMapper.xml

@@ -204,7 +204,7 @@
 
 
     <select id="selectDetailData" resultType="com.xunmei.common.core.domain.drill.vo.CoreDrillDictionaryDetailVo">
-        select id, drill_type, default_cause, drill_projects
+        select id, drill_type, default_cause, drill_projects,drill_category,drill_category_name
         from core_drill_dictionary
         where id = #{id}
     </select>