Merge branch 'dev' into pre-production

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java

@@ -765,24 +765,21 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 			log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> tag {}", 1);
 			List<QuestDetailEntity> list = new ArrayList<>();
 			AtomicBoolean s = new AtomicBoolean(false);
-			taskSearchDTO.getQuestDetailIds().stream().forEach(i -> {
+			taskSearchDTO.getQuestDetailIds().forEach(i -> {
 				log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> tag {}", i);
 
-				//查询当前包件盘点状态
-//				boolean b = questDetailList.stream().anyMatch(q -> q.getId().equals(i) && q.getQuestStatus().equals(1));
-//				if(b){
-//					s.set(true);
-//				}
-				QuestDetailEntity questDetail = new QuestDetailEntity();
-				questDetail.setId(Long.valueOf(i));
-				questDetail.setQuestStatus(1);
-				questDetail.setUpdateUser(user.getUserId());
-				questDetail.setUpdateTime(new Date());
-				questDetail.setInventoryUser(user.getUserId());
-				questDetail.setInventoryTime(new Date());
-//				questDetail.setId(Long.valueOf(i));
-//				questDetail.setQuestStatus(1);
-				list.add(questDetail);
+				if(ObjectUtils.isNotNull(i)){
+					//查询当前包件盘点状态
+
+					QuestDetailEntity questDetail = new QuestDetailEntity();
+					questDetail.setId(Long.valueOf(i));
+					questDetail.setQuestStatus(1);
+					questDetail.setUpdateUser(user.getUserId());
+					questDetail.setUpdateTime(new Date());
+					questDetail.setInventoryUser(user.getUserId());
+					questDetail.setInventoryTime(new Date());
+					list.add(questDetail);
+				}
 			});
 			log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> tag {}", 1);