Changes

src/customerService/customController.go

@@ -215,8 +215,11 @@ func GetUserInfo(context *admin.Context) (interface{}, error) {
 	if err != nil {
 		return nil, err
 	}
-	userData := FindUserInfo(param.MsgId, param.Page.Offset, param.Page.PageSize)
-	return userData, nil
+	userData, total := FindUserInfo(param.MsgId, param.Page.Offset, param.Page.PageSize)
+	return map[string]interface{}{
+		"lists": userData,
+		"total": total,
+	}, nil
 }
 
 func GetUserIds(context *admin.Context) (interface{}, error) {

src/customerService/customService.go

@@ -358,9 +358,10 @@ func GetUserById(id string) (userData *map[string]interface{}, ok bool) {
 	return userData, ok
 }
 
-func FindUserInfo(msgId int, offSet, pageSize int) *[]map[string]interface{} {
+func FindUserInfo(msgId int, offSet, pageSize int) (*[]map[string]interface{}, int64) {
 	users := util.JysqlDB.Find("sendmsg_customer_info", map[string]interface{}{"msg_id": msgId}, "", "createtime desc", offSet, pageSize)
-	return users
+	total := util.JysqlDB.Count("sendmsg_customer_info", map[string]interface{}{"msg_id": msgId})
+	return users, total
 }
 
 func FindUserIds(msgId int) string {

src/customerService/newsService.go

@@ -51,7 +51,7 @@ func MsgDelete(id string) (int, error) {
 }
 
 func MsgDetail(id int) (*map[string]interface{}, error) {
-	info := util.JysqlDB.FindOne("message_send_log", map[string]interface{}{"id": id}, Str, "")
+	info := util.JysqlDB.FindOne("message_send_log", map[string]interface{}{"id": id}, "", "")
 	if info != nil && len(*info) > 0 {
 		link := qutil.ObjToString((*info)["link"])
 		log.Println("详情连接：", link)
@@ -73,11 +73,11 @@ func MsgDetail(id int) (*map[string]interface{}, error) {
 	return nil, errors.New("查询出错")
 }
 
-var Str = "id,send_usergroup_name,msg_type,title,content,send_mode,send_time,send_status,update_time,createtime,link,isdel,send_name,send_usergroup_id"
+//var Str = "id,send_usergroup_name,msg_type,title,content,send_mode,send_time,send_status,update_time,createtime,link,isdel,send_name,send_usergroup_id"
 
 //消息列表查询
 func MsgList(param *MsgListParam, isLookAllMsg, loginUserId int) (*[]map[string]interface{}, int) {
-	sql := "SELECT " + Str + " FROM message_send_log "
+	sql := "SELECT * FROM message_send_log "
 	str := ""
 	sqlc := "SELECT COUNt(*) FROM message_send_log "
 	if param.UserGroupName != "" {