bug修复

src/custom/restcontroller/saletool/courseware/courseware.java

@@ -143,6 +143,15 @@ public class courseware extends Controller {
         countquerySQL.addGroupBy("sat_coursewareid");
         RowsMap coursewareRowsMap = countquerySQL.query().toRowsMap("sat_coursewareid");
 
+         countquerySQL = SQLFactory.createQuerySQL(this, "sat_coursewaredetail",
+                "sat_coursewareid");
+        countquerySQL.addQueryFields("courseware_count", "count(1)");
+        countquerySQL.setSiteid(siteid);
+        countquerySQL.setWhere("status","上架");
+        countquerySQL.setWhere("sat_coursewareid", ids);
+        countquerySQL.addGroupBy("sat_coursewareid");
+        RowsMap onsalecoursewareRowsMap = countquerySQL.query().toRowsMap("sat_coursewareid");
+
         QuerySQL studySQL = SQLFactory.createQuerySQL(this, "sat_courseware_read",
                 "sat_coursewareid");
         studySQL.addQueryFields("study_count", "count(1)");
@@ -168,6 +177,14 @@ public class courseware extends Controller {
             } else {
                 row.put("courseware_count", coursewareRows.get(0).getString("courseware_count"));
             }
+
+            Rows onsalecoursewareRows = onsalecoursewareRowsMap.get(row.getString("sat_coursewareid"));
+            if (onsalecoursewareRows.isEmpty()) {
+                row.put("onsale_courseware_count", 0);
+            } else {
+                row.put("onsale_courseware_count", onsalecoursewareRows.get(0).getString("courseware_count"));
+            }
+
             Rows studyRows = studyRowsMap.get(row.getString("sat_coursewareid"));
             if (studyRows.isEmpty()) {
                 row.put("study_count", 0);

src/custom/restcontroller/webmanage/users/visitors.java

@@ -251,7 +251,7 @@ public class visitors extends Controller {
         }
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sat_sharematerial", "sat_sharematerialid", "title").setTableAlias("t1");
         querySQL.setWhere("classid", 4);
-//        querySQL.setWhere("status", "审核");
+        querySQL.setWhere("status", "发布");
         querySQL.setWhere(where.toString());
         querySQL.setSiteid(siteid);
         querySQL.setPage(pageSize, pageNumber).setOrderBy(pageSorting);
@@ -279,7 +279,7 @@ public class visitors extends Controller {
 
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sat_courseware", "sat_coursewareid").setTableAlias("t1");
         querySQL.setSiteid(siteid);
-//        querySQL.setWhere("status", "审核");
+        querySQL.setWhere("status", "发布");
         querySQL.setDataAuth(true);
         Rows rows = querySQL.query();
 
@@ -316,7 +316,7 @@ public class visitors extends Controller {
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sat_sharematerial", "sat_sharematerialid", "title").setTableAlias("t1");
         querySQL.setSiteid(siteid);
         querySQL.setWhere("classid", 3);
-//        querySQL.setWhere("status", "审核");
+        querySQL.setWhere("status", "发布");
         querySQL.setWhere(where.toString());
         querySQL.setOrderBy(pageSorting).setPage(pageSize, pageNumber);
         querySQL.setDataAuth(true);