Merge branch 'dev/v2.4.21_rjj' of jianyu/qmx_admin into feature/v2.4.21

src/public/message.go

@@ -248,7 +248,7 @@ func GetMegType() {
 	wxBlackPush := map[int]bool{}
 	blackClassMap := map[int]string{}
 	msgTypeToGroupIdMap := map[int]int{}
-	types := util.MessageDB.SelectBySql("SELECT g.switch,c.wxtmpl_Id,c.msg_type,g.group_id FROM message_class c INNER JOIN message_group g on c.group_id =g.group_id WHERE c.background_send=1")
+	types := util.MessageDB.SelectBySql("SELECT g.switch,c.wxtmpl_Id,c.msg_type,g.group_id,g.name FROM message_class c INNER JOIN message_group g on c.group_id =g.group_id WHERE c.background_send=1")
 	if types != nil && len(*types) > 0 {
 		for _, v := range *types {
 			name := qutil.ObjToString(v["name"])