Merge branch 'dev-meta' of xiongzhu/raex_back into master

src/main/java/com/izouma/nineth/repo/MetaTaskBindRepo.java

@@ -13,7 +13,7 @@ public interface MetaTaskBindRepo extends JpaRepository<MetaTaskBind, Long>, Jpa
     List<MetaTaskBind> findByTaskIdAndTypeAndDel(Long taskId, MetaTaskType type, boolean del);
 
     @Query(value = "select m.atom_task_id from meta_task_bind m where m.task_id = ?1 and m.type = ?2 and m.del = false order by m.atom_task_index asc limit 1", nativeQuery = true)
-    Long findAtomTaskId(Long taskId, MetaTaskType type);
+    Long findAtomTaskId(Long taskId, String type);
 
     @Query("select m.atomTaskId from MetaTaskBind m where m.taskId = ?1 and m.del = false")
     List<Long> findAtomTaskIds(Long taskId);

src/main/java/com/izouma/nineth/service/MetaTaskToUserNewService.java

@@ -59,19 +59,19 @@ public class MetaTaskToUserNewService {
                 metaTaskToUserNew.setTaskId(metaTaskNew.getId());
                 // 设置主动领取第一个索引的基础任务
                 if (MetaTaskType.MAIN_LINE.equals(metaTaskNew.getType())) {
-                    Long atomTaskId = metaTaskBindRepo.findAtomTaskId(metaTaskNew.getId(), MetaTaskType.NODE);
+                    Long atomTaskId = metaTaskBindRepo.findAtomTaskId(metaTaskNew.getId(), MetaTaskType.NODE.toString());
                     if (Objects.nonNull(atomTaskId)) {
                         metaTaskToUserNew.setAtomTaskId(atomTaskId);
                     }
                 }
                 if (MetaTaskType.BRANCH_LINE.equals(metaTaskNew.getType())) {
-                    Long atomTaskId = metaTaskBindRepo.findAtomTaskId(metaTaskNew.getId(), MetaTaskType.BRANCH_LINE);
+                    Long atomTaskId = metaTaskBindRepo.findAtomTaskId(metaTaskNew.getId(), MetaTaskType.BRANCH_LINE.toString());
                     if (Objects.nonNull(atomTaskId)) {
                         metaTaskToUserNew.setAtomTaskId(atomTaskId);
                     }
                 }
                 if (MetaTaskType.DAILY.equals(metaTaskNew.getType())) {
-                    Long atomTaskId = metaTaskBindRepo.findAtomTaskId(metaTaskNew.getId(), MetaTaskType.DAILY);
+                    Long atomTaskId = metaTaskBindRepo.findAtomTaskId(metaTaskNew.getId(), MetaTaskType.DAILY.toString());
                     if (Objects.nonNull(atomTaskId)) {
                         metaTaskToUserNew.setAtomTaskId(atomTaskId);
                     }