update

mec-biz/src/main/java/com/ym/mec/biz/service/impl/IndexBaseMonthDataServiceImpl.java

@@ -78,6 +78,10 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 
 	public IndexBaseDto getIndexBaseDto(IndexDataType indexDataType,List<IndexBaseMonthData> indexBaseMonthData) {
 		BigDecimal reduce = indexBaseMonthData.stream().map(e -> e.getPercent()).reduce(BigDecimal.ZERO, BigDecimal::add);
+		indexBaseMonthData.stream().forEach(e -> {
+			e.setDataType(indexDataType);
+			e.setTitle(indexDataType.getMsg());
+		});
 		return new IndexBaseDto(indexDataType,reduce,indexBaseMonthData);
 	}
 

mec-biz/src/main/resources/config/mybatis/IndexBaseMonthDataMapper.xml

@@ -1624,6 +1624,7 @@
 		</if>
 		GROUP BY spo.organ_id_,spo.type_
 		)c ON c.organ_id_ = o.id_
+		WHERE o.tenant_id_ = #{tenantId}
 		GROUP BY o.id_ ORDER BY percent_ DESC
 	</select>