YOHOBUY / yohobuy-union · Commits

Go to a project

Authored by linlong
Commit 8c0e22dc103f84a93e124249051c349cd6e221f4 1 parent fdae8e12

update

Inline Side-by-side
Showing 1 changed file with 4 additions and 1 deletions
@@ -967,8 +967,11 @@ public class UnionServiceImpl implements IUnionService,ApplicationEventPublisher @@ -967,8 +967,11 @@ public class UnionServiceImpl implements IUnionService,ApplicationEventPublisher
967 @Override 967 @Override
968 public PageYHActivateDeviceIdRspBO queryYHActivateDeviceId(YHActivateDeviceIdReqBO yhActivateDeviceIdReqBO, String unionType) { 968 public PageYHActivateDeviceIdRspBO queryYHActivateDeviceId(YHActivateDeviceIdReqBO yhActivateDeviceIdReqBO, String unionType) {
969 log.info("enter queryYHActivateDeviceId. param yhActivateDeviceIdReqBO={},unionType={}", yhActivateDeviceIdReqBO,unionType); 969 log.info("enter queryYHActivateDeviceId. param yhActivateDeviceIdReqBO={},unionType={}", yhActivateDeviceIdReqBO,unionType);
  970 + if(StringUtils.isEmpty(unionType)){
  971 + return null;
  972 + }
970 List<String> unionTypes = Lists.newArrayList(); 973 List<String> unionTypes = Lists.newArrayList();
971 - if (StringUtils.isNotEmpty(unionType)) { 974 + if (!unionType.equals("all")) {
972 unionTypes = Arrays.asList(unionType.split(",")); 975 unionTypes = Arrays.asList(unionType.split(","));
973 } 976 }
974 List<YHActivateDeviceIdRspBO> yhActivateDeviceIdRspBOList = unionLogsDAO.selectYHListByParam(yhActivateDeviceIdReqBO,unionTypes); 977 List<YHActivateDeviceIdRspBO> yhActivateDeviceIdRspBOList = unionLogsDAO.selectYHListByParam(yhActivateDeviceIdReqBO,unionTypes);