Merge commit 'c484da61' into SANDBOX

app/controllers/mobile/forumShare.js

@@ -333,14 +333,14 @@ router.get('/sharev2.js', function(req, res, next) {
                         //type为index时的，默认link
                         link = config.service + '/app/forum/' + ent_code + '/mediashequn'
                         request.get({url:config.rest_api+'/v1.0/internal/forum/config/enter/byentcode?entCode='+ent_code,body:{},json:true}, function (e, r, result) {
-                            if(result.data){
+                            if(result && result.data){
                                 link = result.data;
                             }
                             cont();
                         });
                     },function(cont){
                         request.get({url:config.rest_api+'/v1.0/internal/forum/config/share/byentcode?entCode='+ent_code,body:{},json:true}, function (e, r, result) {
-                            if(result.data){
+                            if(result && result.data){
                                 try{
                                     var obj = JSON.parse(result.data);
                                     title = obj.shareTitle || '';
@@ -381,7 +381,7 @@ router.get('/sharev2.js', function(req, res, next) {
             res.json(_.assign({result:false},returnCode.WRONG_PARAM));
         }else if(type === 'notice'){
             Notice.findOne({_id:id},function(err,result){
-                if (err) {
+                if (err || !result) {
                     console.error(err);
                     res.json(_.assign({result:false},returnCode.BUSY));
                 }

app/models/forumThread.js

@@ -140,7 +140,7 @@ var ForumThreadSchema = new Schema({
 	    type: Schema.Types.ObjectId,
 	    ref: 'ForumUser'
 	}],
-	isEvent:{//是否活动 0否 1是 
+	isEvent:{//是否活动改为0立即发布，1活动，2定时发布(到了发布时间才在手机端显示) by lws 20160317
 		type: Number,
 		require: true,
 		default: 0
@@ -155,6 +155,10 @@ var ForumThreadSchema = new Schema({
 		    required: false
 		}
 	},
+	release_time:{//发布时间，如果isEvent为2就是定时发布,需要发布时间
+		type: Date,
+		required: false
+	},
 	created: {
 	    type: Date,
 	    required: true,