update

@@ -967,8 +967,11 @@ public class UnionServiceImpl implements IUnionService,ApplicationEventPublisher
 	@Override
 	public PageYHActivateDeviceIdRspBO queryYHActivateDeviceId(YHActivateDeviceIdReqBO yhActivateDeviceIdReqBO, String unionType) {
 		log.info("enter queryYHActivateDeviceId. param yhActivateDeviceIdReqBO={},unionType={}", yhActivateDeviceIdReqBO,unionType);
+		if(StringUtils.isEmpty(unionType)){
+			return null;
+		}
 		List<String> unionTypes = Lists.newArrayList();
-		if (StringUtils.isNotEmpty(unionType)) {
+		if (!unionType.equals("all")) {
 			unionTypes = Arrays.asList(unionType.split(","));
 		}
 		List<YHActivateDeviceIdRspBO>  yhActivateDeviceIdRspBOList = unionLogsDAO.selectYHListByParam(yhActivateDeviceIdReqBO,unionTypes);