Index: lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonJoinServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonJoinServlet.java,v
diff -u -r1.3 -r1.4
--- lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonJoinServlet.java	15 Aug 2008 04:37:18 -0000	1.3
+++ lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonJoinServlet.java	3 Sep 2008 02:40:42 -0000	1.4
@@ -155,7 +155,7 @@
 				addUserToOrg(user, Integer.valueOf(orgId));
 				
 				// get list of lessons based on ldId
-				List lessons = lessonService.getLessonsByOriginalLearningDesign(Long.valueOf(ldId));
+				List lessons = lessonService.getLessonsByOriginalLearningDesign(Long.valueOf(ldId), Integer.valueOf(orgId));
 				if (lessons != null && lessons.size() > 0) {
 					
 					// add to first lesson where lesson size < learnerSize
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILessonDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILessonDAO.java,v
diff -u -r1.23 -r1.24
--- lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILessonDAO.java	14 Apr 2008 06:36:07 -0000	1.23
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILessonDAO.java	3 Sep 2008 02:40:42 -0000	1.24
@@ -151,7 +151,8 @@
     /**
      * Get lessons based on learning designs where the original learning design has the given id.
      * @param ldId
+     * @param orgId
      * @return list of lessons
      */
-    public List getLessonsByOriginalLearningDesign(final Long ldId);
+    public List getLessonsByOriginalLearningDesign(final Long ldId, final Integer orgId);
 }
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java,v
diff -u -r1.32 -r1.33
--- lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java	14 Apr 2008 06:36:07 -0000	1.32
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java	3 Sep 2008 02:40:42 -0000	1.33
@@ -66,7 +66,8 @@
 		+ Lesson.class.getName() + " l "
 		+ "where l.learningDesign.originalLearningDesign.learningDesignId = ? "
 		+ "and l.learningDesign.copyTypeID != " + LearningDesign.COPY_TYPE_PREVIEW + " "
-		+ "and l.lessonStateId = " + Lesson.STARTED_STATE
+		+ "and l.lessonStateId = " + Lesson.STARTED_STATE + " "
+		+ "and l.organisation.organisationId = ? "
 		+ " order by l.lessonName";
 
     /**
@@ -332,9 +333,10 @@
    /**
     * @see org.lamsfoundation.lams.lesson.dao.ILessonDAO#getLessonsByOriginalLearningDesign(Integer)
     */
-   public List getLessonsByOriginalLearningDesign(final Long ldId)
+   public List getLessonsByOriginalLearningDesign(final Long ldId, final Integer orgId)
    {
-	   List lessons = this.getHibernateTemplate().find(LESSONS_WITH_ORIGINAL_LEARNING_DESIGN, ldId.longValue());
+	   Object[] args = {ldId.longValue(), orgId.intValue()};
+	   List lessons = this.getHibernateTemplate().find(LESSONS_WITH_ORIGINAL_LEARNING_DESIGN, args);
 	   return lessons;
    }
 
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java,v
diff -u -r1.20 -r1.21
--- lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java	14 Apr 2008 06:36:07 -0000	1.20
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java	3 Sep 2008 02:40:42 -0000	1.21
@@ -285,7 +285,8 @@
     /**
      * Gets list of lessons which are originally based on the given learning design id.
      * @param ldId
+     * @param orgId
      * @return list of lessons
      */
-    public List getLessonsByOriginalLearningDesign(Long ldId);
+    public List getLessonsByOriginalLearningDesign(Long ldId, Integer orgId);
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java,v
diff -u -r1.28 -r1.29
--- lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java	6 Jun 2008 03:31:24 -0000	1.28
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java	3 Sep 2008 02:40:42 -0000	1.29
@@ -685,7 +685,7 @@
 	    /**
 		 * Gets list of lessons which are originally based on the given learning design id.
 		 */
-		public List getLessonsByOriginalLearningDesign(Long ldId) {
-			return this.lessonDAO.getLessonsByOriginalLearningDesign(ldId);
+		public List getLessonsByOriginalLearningDesign(Long ldId, Integer orgId) {
+			return this.lessonDAO.getLessonsByOriginalLearningDesign(ldId, orgId);
 		}
 }