Merge branch 'feature/gn3.2_send_msg' into debug

controllers/report_ice_message.go

@@ -492,8 +492,7 @@ func (c *ReportIceMessageController) IceMsgPush() {
 	}else{
 		if !needPush {
 			br.Msg = "已推送成功，请勿重复推送！"
-			br.Success = true
-			br.Ret = 200
+			return
 		}else{
 			br.Msg = "推送失败"
 			br.ErrMsg = "推送失败，Err:" + err.Error()

models/report_message_config.go

@@ -243,7 +243,7 @@ func (m *ReportMessageRecord) GetSuccessRecordAdminIdsByReportId(reportId int, t
 
 // 查询消息推送记录
 func (m *ReportMessageRecord) GetSuccessRecordAdminIdsByPptId(pptId int, title, content, url string) (adminIds []int, err error) {
-	sql := fmt.Sprintf(`SELECT DISTINCT receive_admin_id FROM %s WHERE ppt_id = ? AND ppt_title = ? AND ppt_content = ? AND ppt_url = ? AND status = 1`, m.TableName())
+	sql := fmt.Sprintf(`SELECT DISTINCT receive_admin_id FROM %s WHERE ppt_id = ? AND report_title = ? AND content = ? AND url = ? AND status = 1`, m.TableName())
 	err = global.DmSQL["rddp"].Raw(sql, pptId, title, content, url).Scan(&adminIds).Error
 	return
 }