Merge branch 'test' of http://gitlab.fjmaimaimai.com/mmm-go/oppmg into test

@@ -42,6 +42,7 @@ const (
 const (
 const (
 	SqlDeleteUserMsg              = "delete from user_msg where company_id=? and msg_type=? and source_id=?"
 	SqlDeleteUserMsg              = "delete from user_msg where company_id=? and msg_type=? and source_id=?"
 	SqlUpdateUserMsgPublic        = "update user_msg set is_public=? where company_id=? and msg_type=? and source_id=?"
 	SqlUpdateUserMsgPublic        = "update user_msg set is_public=? where company_id=? and msg_type=? and source_id=?"
+	SqlUpdateUserMsgPublicInUsers = "update user_msg set is_public=? where company_id=? and msg_type=? and source_id=? and receive_user_id in (%v)"
 )
 )
 
 
 func (t *UserMsg) TableName() string {
 func (t *UserMsg) TableName() string {

@@ -169,7 +169,7 @@ func sendBulletinUserMsg(orm orm2.Ormer, receivers []protocol.VisibleObject, com
 			return
 			return
 		}
 		}
 	}
 	}
-	if err = utils.ExecuteSQLWithOrmer(orm, models.SqlUpdateUserMsgPublic, models.Public, companyId, models.MsgTypeBulletin, sourceId); err != nil {
+	if err = utils.ExecuteSQLWithOrmer(orm, fmt.Sprintf(models.SqlUpdateUserMsgPublicInUsers, utils.JoinInt64s(ids, ",")), models.Public, companyId, models.MsgTypeBulletin, sourceId); err != nil {
 		log.Error(err.Error())
 		log.Error(err.Error())
 		orm.Rollback()
 		orm.Rollback()
 		return
 		return
@@ -310,10 +310,12 @@ func GetBulletin(id int, companyId int64, request *protocol.GetBulletinRequest)
 			Type:  int(question.Type),
 			Type:  int(question.Type),
 			Title: question.Title,
 			Title: question.Title,
 		}
 		}
+		if len(question.Content) > 0 {
 			if err = json.Unmarshal([]byte(question.Content), &rsp.Question.Content); err != nil {
 			if err = json.Unmarshal([]byte(question.Content), &rsp.Question.Content); err != nil {
 				log.Error(err.Error())
 				log.Error(err.Error())
 				return
 				return
 			}
 			}
+		}
 		for i := range rsp.Question.Content {
 		for i := range rsp.Question.Content {
 			if rsp.Question.Content[i].Id == -1 && len(rsp.Question.Content[i].Content) == 0 {
 			if rsp.Question.Content[i].Id == -1 && len(rsp.Question.Content[i].Content) == 0 {
 				rsp.Question.Content[i].Content = "其他"
 				rsp.Question.Content[i].Content = "其他"
@@ -406,7 +408,7 @@ func UpdateBulletin(companyId int64, request *protocol.UpdateBulletinRequest) (r
 				log.Error(err.Error())
 				log.Error(err.Error())
 				return
 				return
 			}
 			}
-			bulletinQuestion.Title = request.Title
+			bulletinQuestion.Title = request.Question.Title
 			bulletinQuestion.Content = string(questionContent)
 			bulletinQuestion.Content = string(questionContent)
 			bulletinQuestion.Type = int8(request.Question.Type)
 			bulletinQuestion.Type = int8(request.Question.Type)
 			bulletinQuestion.UpdateAt = time.Now()
 			bulletinQuestion.UpdateAt = time.Now()
@@ -418,10 +420,16 @@ func UpdateBulletin(companyId int64, request *protocol.UpdateBulletinRequest) (r
 		}
 		}
 		if err == orm2.ErrNoRows {
 		if err == orm2.ErrNoRows {
 			//添加
 			//添加
+			questionContent, err = json.Marshal(request.Question.Content)
+			if err != nil {
+				orm.Rollback()
+				log.Error("格式化问题失败:%s", err)
+				return
+			}
 			bulletinQuestion = &models.BulletinQuestion{
 			bulletinQuestion = &models.BulletinQuestion{
 				BulletinId: bulletin.Id,
 				BulletinId: bulletin.Id,
 				Type:       int8(request.Question.Type),
 				Type:       int8(request.Question.Type),
-				Title:      request.Title,
+				Title:      request.Question.Title,
 				Content:    string(questionContent),
 				Content:    string(questionContent),
 				CreateAt:   time.Now(),
 				CreateAt:   time.Now(),
 				UpdateAt:   time.Now(),
 				UpdateAt:   time.Now(),