Merge remote-tracking branch 'origin/dev' into dev

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

@@ -911,7 +911,16 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 			}
 			if(!i.getQuestStatus().equals(0)){
 				R<List<User>> listR = userSearchClient.listByUser(String.valueOf(i.getUpdateUser()));
-				questDetailVO.setInventoryPerson(listR.getData().get(0).getName());
+				if(ObjectUtils.isNotNull(listR.getData())){
+					List<User> data = listR.getData();
+					if(ObjectUtils.isNotNull(data)){
+						User user = data.get(0);
+						if(user!=null){
+							questDetailVO.setInventoryPerson(user.getName());
+						}
+
+					}
+				}
 				questDetailVO.setInventoryDate(i.getUpdateTime());
 			}