解决冲突

Mall.Module.TradePavilion/Mall.Module.TradePavilion.csproj

@@ -5,6 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Mall.Model\Mall.Model.csproj" />
     <ProjectReference Include="..\Mall.Repository\Mall.Repository.csproj" />
   </ItemGroup>
 

Mall.Repository/Point/RB_Point_TeacherCourseRepository.cs

@@ -38,10 +38,6 @@ LEFT JOIN rb_education_teacher as et on tc.TeacherId=et.ID
                 {
                     sb.AppendFormat(" and tc.MallBaseId={0}", where.MallBaseId);
                 }
-                if (where.MallBaseId > 0)
-                {
-                    sb.AppendFormat(" and tc.MallBaseId={0}", where.MallBaseId);
-                }
                 if (where.CourseClassId > 0)
                 {
                     sb.AppendFormat(" and tc.CourseClassId={0}", where.CourseClassId);
@@ -91,10 +87,6 @@ LEFT JOIN rb_education_teacher as et on tc.TeacherId=et.ID
                 {
                     sb.AppendFormat(" and MallBaseId={0}", where.MallBaseId);
                 }
-                if (where.MallBaseId > 0)
-                {
-                    sb.AppendFormat(" and MallBaseId={0}", where.MallBaseId);
-                }
                 if (where.CourseClassId > 0)
                 {
                     sb.AppendFormat(" and CourseClassId={0}", where.CourseClassId);
@@ -146,10 +138,6 @@ left join (SELECT CourseId,SUM(case when OrderStaus =2 then 1 else 0 end) AS Con
                 {
                     sb.AppendFormat(" and tc.MallBaseId={0}", where.MallBaseId);
                 }
-                if (where.MallBaseId > 0)
-                {
-                    sb.AppendFormat(" and tc.MallBaseId={0}", where.MallBaseId);
-                }
                 if (where.CourseClassId > 0)
                 {
                     sb.AppendFormat(" and tc.CourseClassId={0}", where.CourseClassId);
@@ -173,11 +161,11 @@ left join (SELECT CourseId,SUM(case when OrderStaus =2 then 1 else 0 end) AS Con
                 if (where.CourseStudyState > 0) {
                     if (where.CourseStudyState == 1)
                     {
-                        sb.AppendFormat(" AND CONCAT(DATE_FORMAT(StudyDate,'%Y-%m-%d'),' ',StudyEndDate) >= '{1}' ", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+                        sb.AppendFormat(" AND CONCAT(DATE_FORMAT(StudyDate,'%Y-%m-%d'),' ',StudyEndDate) >= '{0}' ", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
                     }
                     else if (where.CourseStudyState == 2)
                     {
-                        sb.AppendFormat(" AND CONCAT(DATE_FORMAT(StudyDate,'%Y-%m-%d'),' ',StudyEndDate) < '{1}' ", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+                        sb.AppendFormat(" AND CONCAT(DATE_FORMAT(StudyDate,'%Y-%m-%d'),' ',StudyEndDate) < '{0}' ", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
                     }
                 }
             }