Merge remote-tracking branch 'origin/develop-yellow' into develop2

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);