--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/label/LabelDataTypeServiceImpl.java

@@ -46,7 +46,7 @@ public class LabelDataTypeServiceImpl extends BaseServiceImpl<LabelDataType,Inte
 	@Override
 	public PageInfo<LabelAndContentByDataTypeVO> queryLabelAndContentByDataType(String dataType, Integer nationsType) {
 		List<LabelAndContentByDataTypeVO> vos = new ArrayList<LabelAndContentByDataTypeVO>();
-		List<LabelAndContentByDataTypeVO> lab = labelmapper.queryLabelByData(dataType, nationsType);
+		List<Label> lab = labelmapper.queryLabelByData(dataType, nationsType);
 		lab.forEach(l ->{
 			LabelAndContentByDataTypeVO vo = new LabelAndContentByDataTypeVO();
 			BeanUtils.copyProperties(l, vo);
@@ -67,14 +67,15 @@ public class LabelDataTypeServiceImpl extends BaseServiceImpl<LabelDataType,Inte
 
 	@Override
 	public List<LabelAndContentByDataTypeVO> queryLabel(String dataType, Integer nationsType) {
-		//List<LabelAndContentByDataTypeVO> vos = new ArrayList<LabelAndContentByDataTypeVO>();
-		List<LabelAndContentByDataTypeVO> lab = labelmapper.queryLabelByData(dataType,nationsType);
-//		lab.forEach(l -> {
-//			LabelAndContentByDataTypeVO vo = new LabelAndContentByDataTypeVO();
-//			BeanUtils.copyProperties(l, vo);
-//			vos.add(vo);
-//		});
-		return lab;
+
+		List<LabelAndContentByDataTypeVO> vos = new ArrayList<LabelAndContentByDataTypeVO>();
+		List<Label> lab = labelmapper.queryLabelByData(dataType,nationsType);
+		lab.forEach(l -> {
+			LabelAndContentByDataTypeVO vo = new LabelAndContentByDataTypeVO();
+			BeanUtils.copyProperties(l, vo);
+			vos.add(vo);
+		});
+		return vos;
 	}
 
 	@Override