xujun

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectKpitServiceImpl.java

@@ -42,11 +42,12 @@ public class ComProjectKpitServiceImpl extends BaseServiceImpl<ComProjectKpitDAO
 
         threeLevelList.forEach(e -> {
             List<ComProjectKpitDTO> findList1 = towLevelList.stream().filter(f -> e.getLevelId().equals(f.getId())).collect(Collectors.toList());
-            ComProjectKpitDTO oneModel = findList1.get(0);
-            e.setOneLevelName(oneModel.getKpitName());
-            List<ComProjectKpitDTO> findList2 = oneLevelList.stream().filter(f -> oneModel.getLevelId().equals(f.getId())).collect(Collectors.toList());
             ComProjectKpitDTO towModel = findList1.get(0);
             e.setTowLevelName(towModel.getKpitName());
+
+            List<ComProjectKpitDTO> findList2 = oneLevelList.stream().filter(f -> towModel.getLevelId().equals(f.getId())).collect(Collectors.toList());
+            ComProjectKpitDTO oneModel = findList2.get(0);
+            e.setOneLevelName(oneModel.getKpitName());
         });
 
         return threeLevelList;

science-admin/src/main/resources/mapper/ComProjectKpitDAO.xml

@@ -10,5 +10,5 @@
     <select id="getProjectKpit" resultType="com.yiboshi.science.param.dto.ComProjectKpitDTO">
         select * from com_project_kpit order by type_id, id
     </select>
-    
+
 </mapper>