Merge branch 'energy-manage-chy'

energy-manage-service/src/main/java/com/energy/manage/service/service/analysis/impl/AnalysisServiceImpl.java

@@ -461,7 +461,7 @@ public class AnalysisServiceImpl implements AnalysisService {
     private List<Map<String, Object>> getAnalysisType(Set<String> analysisCodes){
         List<AnalysisTypePo> analysisTypePos = analysisTypeMapper.selectAllByOrderNum();
         if(CollectionUtils.isNotEmpty(analysisCodes)){
-            analysisTypePos = analysisTypePos.stream().filter(item -> analysisCodes.contains(item.getTypeCode())).collect(Collectors.toList());
+            analysisTypePos = analysisTypePos.stream().filter(item -> analysisCodes.contains(item.getTypeCode()) || item.getParentId().equals(ZREO_STR)).collect(Collectors.toList());
         }
         return TreeUtil.getJava8ResultTree(BeanMapUtils.listBeanToListMap(analysisTypePos), "parentId", "id");
     }

energy-manage-service/src/main/resources/mybatis/analysis/AnalysisTypeMapper.xml

@@ -22,7 +22,7 @@
     </select>
 
     <select id="selectAllByOrderNum" resultMap="BaseResultMap">
-        select *
+        select id,parent_id,type_code,type_name
         from analysis_type
         order by order_num
     </select>