Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/pbl-api

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "compile-hero.disable-compile-files-on-did-save-code": false
+}

pbl.js

@@ -109,7 +109,7 @@ router.route('/insertClass').all((req, res, next) => {
 /* 查询班级 */
 router.route('/selectClass').all((req, res, next) => {
     var json = queryString(req.url);
-    getmysql(req, res, "selectClass", json['cu'], json['cn'], json['page'], 10);
+    getmysql(req, res, "selectClass", json['cu'], json['oid'], json['cn'], json['page'], 10);
 });
 /* 删除班级 */
 router.route('/deleteClass').all((req, res, next) => {
@@ -126,7 +126,7 @@ router.route('/selectOrg').all((req, res, next) => {
 router.route('/insertStudent').all((req, res, next) => {
     var json = queryString(req.url);
     json['userpassword'] = bcrypt.hashSync(json['userpassword'], bcrypt.genSaltSync(10))
-    getmysql(req, res, "insertStudent",json['ph'],json['username'],json['userpassword'],json['type'],json['oid'],json['tid'],json['cid']);
+    getmysql(req, res, "insertStudent", json['ph'], json['username'], json['userpassword'], json['type'], json['oid'], json['tid'], json['cid']);
 });
 
 /* 新增学生 */
@@ -189,13 +189,13 @@ router.route('/getWorks').all((req, res, next) => {
 //查询项目
 router.route('/getProject').all((req, res, next) => {
     var json = queryString(req.url);
-    getmysql(req, res, "selectProject", json['cu'], json['cn'], json['page'], 10);
+    getmysql(req, res, "selectProject", json['type'], json['uid'], json['oid'], json['cn'], json['page'], 10);
 });
 
 //查询项目成员
 router.route('/selectProjectStudent').all((req, res, next) => {
     var json = queryString(req.url);
-    getmysql(req, res, "select_student", json['cn'],json['oid'], json['uid']);
+    getmysql(req, res, "select_student", json['cn'], json['oid'], json['uid']);
 });
 
 //新增课程
@@ -205,7 +205,8 @@ router.route('/addWork').all((req, res, next) => {
 
 //查询课程
 router.route('/selectCourse').all((req, res, next) => {
-    getmysql(req, res, "select_course");
+    var json = queryString(req.url);
+    getmysql(req, res, "select_course", json['type'], json['uid'], json['oid'], json['page'], 10);
 });
 
 //查询学校
@@ -394,6 +395,12 @@ router.route('/deleteCourseAdmin').all((req, res, next) => {
     postmysql(req, res, "delete_courseAdmin",);
 });
 
+//teacher 查询模板
+router.route('/getTemplateT').all((req, res, next) => {
+    var json = queryString(req.url);
+    getmysql(req, res, "select_templateT");
+});
+
 
 queryString = function (url) {
     var a = url.split("?");