bug修改

@@ -6,6 +6,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeUnit;
 
 
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -136,12 +137,15 @@ public class TimeTaskServiceImpl implements ITimeTaskService {
 		}
 		}
 
 
 		// (2)获取白名单排队列表,并用作最终中奖的排队列表
 		// (2)获取白名单排队列表,并用作最终中奖的排队列表
+		List<DrawlineUserQueue> drawlineUserQueueList = new ArrayList<DrawlineUserQueue>();
 		String whileList = drawlinePrizeSetting.getWhiteList();
 		String whileList = drawlinePrizeSetting.getWhiteList();
-		List<DrawlineUserQueue> drawlineUserQueueList = drawlineUserQueueDAO.selectRealUserQueueByActIdAndUids(id, whileList);
+		if (StringUtils.isNotEmpty(whileList)) {
+			drawlineUserQueueList = drawlineUserQueueDAO.selectRealUserQueueByActIdAndUids(id, whileList);
 			logger.debug("luckyDraw: drawlineUserQueueDAO.selectRealUserQueueByActIdAndUids. activityId is {}, uids is {}", id, whileList);
 			logger.debug("luckyDraw: drawlineUserQueueDAO.selectRealUserQueueByActIdAndUids. activityId is {}, uids is {}", id, whileList);
 			if (null == drawlineUserQueueList) {
 			if (null == drawlineUserQueueList) {
 				drawlineUserQueueList = new ArrayList<DrawlineUserQueue>();
 				drawlineUserQueueList = new ArrayList<DrawlineUserQueue>();
 			}
 			}
+		}
 
 
 		// (3)获取真实用户中奖数量，中奖排队列表，并加入到最终中奖的排队列表中
 		// (3)获取真实用户中奖数量，中奖排队列表，并加入到最终中奖的排队列表中
 		int realUserNum = drawlinePrizeSetting.getRealUserNum().intValue() - drawlineUserQueueList.size();
 		int realUserNum = drawlinePrizeSetting.getRealUserNum().intValue() - drawlineUserQueueList.size();
@@ -265,7 +269,7 @@ public class TimeTaskServiceImpl implements ITimeTaskService {
 		return res;
 		return res;
 	}
 	}
 
 
-	public void shutdownLuckyUserNotice(){
+	public void shutdownLuckyUserNotice() {
 		logger.info("Enter shutdownLuckyUserNotice");
 		logger.info("Enter shutdownLuckyUserNotice");
 
 
 		// 关闭定时任务线程
 		// 关闭定时任务线程