|
@@ -394,7 +394,9 @@ us.addUser = function (response, type, fileid, userids, userid, pageid) {
|
|
|
us.getuserbytype = function (userids) {
|
|
|
var _userinfo = [];
|
|
|
for (var i in userids) {
|
|
|
- _userinfo.push(us.user[i])
|
|
|
+ if (us.user[i]) {
|
|
|
+ _userinfo.push(us.user[i])
|
|
|
+ }
|
|
|
}
|
|
|
return _userinfo;
|
|
|
}
|
|
@@ -2051,10 +2053,13 @@ us.getcscl = function (response, calssid, pageid, userid) {
|
|
|
var _user = us.getuserbytype(us.cscl[calssid].user); //获取当前项目下所有的用户信息
|
|
|
var _data = us.cscl[calssid].content; //保存在内存的知识建构数据
|
|
|
if (ret) {
|
|
|
- console.log("aaaaaaaaaaaaa")
|
|
|
+ console.log("aaaaaaaaaaaaa");
|
|
|
+ console.log(_user)
|
|
|
ret[0][0].user = _user; //这里是项目当前所有用户
|
|
|
ret[0][0].data = _data; //把思维网格的内容转化成数组
|
|
|
- us.sendUser(us.user[userid], "cscl", pageid, calssid); //加入知识建构项目后通知所有的用户
|
|
|
+ if (userid && us.user) {
|
|
|
+ us.sendUser(us.user[userid], "cscl", pageid, calssid); //加入知识建构项目后通知所有的用户
|
|
|
+ }
|
|
|
response.end(JSON.stringify(ret)); //返回文档内容
|
|
|
}
|
|
|
else {
|
|
@@ -2076,7 +2081,7 @@ us.getcscl = function (response, calssid, pageid, userid) {
|
|
|
function (ret) {
|
|
|
var _user = us.getuserbytype(us.cscl[calssid].user);
|
|
|
if (ret) {
|
|
|
- console.log("bbbbbbbbbbbbbbb")
|
|
|
+ //console.log("bbbbbbbbbbbbbbb")
|
|
|
ret[0][0].user = _user; //这里是项目当前所有用户
|
|
|
us.cscl[calssid].content = JSON.parse(ret[0][0].data); //把思维网格的内容转化成数组
|
|
|
//us.sendUser(us.user[userid], "cscl", pageid, calssid); //加入知识建构项目后通知所有的用户
|