导入题库同名类别子类别bug修复

fs-service/src/main/java/com/fs/course/mapper/FsUserCourseCategoryMapper.java

@@ -85,7 +85,7 @@ public interface FsUserCourseCategoryMapper
     /**
      * 查询所有分类
      */
-    @Select("select cate_id as cateId, cate_name as cateName, pid from fs_user_course_category where is_del=0")
+    @Select("select cate_id as cateId, concat(cate_name,'-',pid) as cateName, pid from fs_user_course_category where is_del=0")
     @MapKey("cateName")
     Map<String,FsUserCourseCategory> queryAllCategoryData();
 

fs-service/src/main/java/com/fs/course/service/impl/FsCourseQuestionBankServiceImpl.java

@@ -648,14 +648,14 @@ public class FsCourseQuestionBankServiceImpl implements IFsCourseQuestionBankSer
             return;
         }
 
-        FsUserCourseCategory category = categoryData.get(importDTO.getQuestionType().trim());
+        FsUserCourseCategory category = categoryData.get(importDTO.getQuestionType().trim()+"-0");
         if (category != null) {
             questionBank.setQuestionType(category.getCateId());
 
             // 子分类
             if (StringUtils.isNotBlank(importDTO.getQuestionSubTyp())) {
-                FsUserCourseCategory subCategory = categoryData.get(importDTO.getQuestionSubTyp().trim());
-                if (subCategory != null && Objects.equals(subCategory.getPid(), category.getCateId())) {
+                FsUserCourseCategory subCategory = categoryData.get(importDTO.getQuestionSubTyp().trim()+"-" + category.getCateId());
+                if (subCategory != null) {
                     questionBank.setQuestionSubType(subCategory.getCateId());
                 }
             }