Subversion Repositories SmartDukaan

Rev

Rev 30428 | Rev 30985 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 30428 Rev 30764
Line 349... Line 349...
349
			fofoIds.add(ticket.getFofoId());
349
			fofoIds.add(ticket.getFofoId());
350
		}
350
		}
351
 
351
 
352
		Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
352
		Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
353
 
353
 
354
		Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = fofoIds.stream().distinct().map(x -> customRetailerMap.get(x))
354
		Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = fofoIds.stream().distinct()
355
				.filter(x -> x != null).collect(Collectors.toList()).stream()
355
				.map(x -> customRetailerMap.get(x)).filter(x -> x != null).collect(Collectors.toList()).stream()
356
				.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
356
				.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
357
		return fofoIdsAndCustomRetailer;
357
		return fofoIdsAndCustomRetailer;
358
	}
358
	}
359
 
359
 
360
	@Override
360
	@Override
Line 779... Line 779...
779
		List<Position> positions = positionRepository.selectPositionbyCategoryIdAndEscalationType(categoryId,
779
		List<Position> positions = positionRepository.selectPositionbyCategoryIdAndEscalationType(categoryId,
780
				escalationType);
780
				escalationType);
781
		List<Integer> authIds = positions.stream().map(x -> x.getAuthUserId()).distinct().collect(Collectors.toList());
781
		List<Integer> authIds = positions.stream().map(x -> x.getAuthUserId()).distinct().collect(Collectors.toList());
782
 
782
 
783
		LOGGER.info("authIds" + authIds);
783
		LOGGER.info("authIds" + authIds);
784
 
-
 
-
 
784
		List<AuthUser> authUsers = new ArrayList<>();
-
 
785
		if (!authIds.isEmpty()) {
785
		List<AuthUser> authUsers = authRepository.selectAllAuthUserByIds(authIds);
786
			authUsers = authRepository.selectAllAuthUserByIds(authIds);
-
 
787
		}
786
 
788
 
787
		LOGGER.info("authUsers" + authUsers);
789
		LOGGER.info("authUsers" + authUsers);
788
		return authUsers;
790
		return authUsers;
789
	}
791
	}
790
 
792