Merge branch 'yb/4.0' into debug

# Conflicts:
#	init_serve/router.go
#	models/response/report.go
#	models/tables/rddp/report/query.go
#	models/tables/rddp/report_chapter/query.go
#	utils/constants.go

services/message/message.go

@@ -89,6 +89,10 @@ func SingleRead(user user.UserInfo, req message.ReqMessage) (err error) {
 			global.LOG.Critical(fmt.Sprintf("message SingleRead: userId=%d, err:%s， errMsg:%s", user.UserID, err.Error(), errMsg))
 		}
 	}()
+	if req.MsgId <=0 {
+		err = errors.New("请输入消息序号")
+		return
+	}
 	//查询当前消息
 	msgInfo, err := yb_message.GetMsgByMsgId(user.UserID, req.MsgId)
 	if err != nil {
@@ -124,6 +128,10 @@ func SingleDelete(user user.UserInfo, req message.ReqMessage) (err error) {
 			global.LOG.Critical(fmt.Sprintf("message SingleDelete: userId=%d, err:%s， errMsg:%s", user.UserID, err.Error(), errMsg))
 		}
 	}()
+	if req.MsgId <=0 {
+		err = errors.New("请输入消息序号")
+		return
+	}
 	//查询当前消息
 	msgInfo, err := yb_message.GetMsgByMsgId(user.UserID, req.MsgId)
 	if err != nil {