Changes

src/customerService/customController.go

@@ -64,7 +64,7 @@ func MyCustomerList(context *admin.Context) (interface{}, error) {
 	}
 	log.Println(param)
 	adminPhone := context.User.Phone
-	count, data := MyCustomerService(param.State, param.UpdateTimeStart, param.UpdateTimeEnd, param.CompanyName, param.Phone, adminPhone)
+	count, data := MyCustomerService(param.State, param.UpdateTimeStart, param.UpdateTimeEnd, param.CompanyName, param.Phone, adminPhone, param.Page.Offset, param.Page.PageSize)
 	return map[string]interface{}{
 		"lists": data,
 		"total": count,

src/customerService/customService.go

@@ -55,6 +55,7 @@ func CustomSendMsgService(param *customMsg, sendStatus int, loginUserName string
 				"send_userid":         loginUserId,
 				"user_add_way":        param.UserAddWay,
 				"template_name":       param.TemplateName,
+				"update_user":         loginUserName,
 			})
 			return ok1 && ok && count > 0
 		})
@@ -108,6 +109,7 @@ func CustomSendMsgService(param *customMsg, sendStatus int, loginUserName string
 				"sign":          1,
 				"user_add_way":  param.UserAddWay,
 				"template_name": param.TemplateName,
+				"update_user":   loginUserName,
 			})
 			//var fields []string
 			//var args []interface{}
@@ -254,7 +256,7 @@ func CustomSendMsgService(param *customMsg, sendStatus int, loginUserName string
 	return 0, errors.New("发送消息出错")
 }
 
-func MyCustomerService(state, updateTimeStart, updateTimeEnd, companyName, phone, adminPhone string) (count int64, data []map[string]interface{}) {
+func MyCustomerService(state, updateTimeStart, updateTimeEnd, companyName, phone, adminPhone string, offSet, pageSize int) (count int64, data []map[string]interface{}) {
 	salesperson := util.CusTiDb.FindOne("jy_salesperson_info", map[string]interface{}{"phone": adminPhone}, "seatNumber", "")
 	if salesperson != nil && len(*salesperson) > 0 {
 		code := qutil.ObjToString((*salesperson)["seatNumber"])
@@ -281,7 +283,7 @@ func MyCustomerService(state, updateTimeStart, updateTimeEnd, companyName, phone
 			sqlStr += str
 			sqlc += str
 		}
-		sqlStr += " order by lastUpdateTime desc "
+		sqlStr += " order by lastUpdateTime desc limit " + fmt.Sprint(offSet) + " " + "," + " " + fmt.Sprint(pageSize)
 		log.Println("sql:", sqlStr)
 		log.Println("sqlc:", sqlc)
 		count = util.CusTiDb.CountBySql(sqlc)

src/customerService/newsService.go

@@ -67,6 +67,9 @@ func MsgDetail(id int) (*map[string]interface{}, error) {
 			(*info)["iosUrl"] = ""
 			(*info)["weChatUrl"] = ""
 		}
+		if qutil.IntAll((*info)["sign"]) == 1 || qutil.IntAll((*info)["sign"]) == 1 {
+			(*info)["send_usergroup_name"] = "自定义"
+		}
 		log.Println("消息详情信息：", *info)
 		return info, nil
 	}
@@ -566,6 +569,7 @@ func SendMsg(param *Message, sendStatus int, loginUserName string, loginUserId i
 			"link":        param.Link,
 			"isdel":       1,
 			"send_userid": loginUserId,
+			"update_user": loginUserName,
 		})
 		if !ok {
 			return 0, errors.New("发送消息出错")
@@ -612,6 +616,7 @@ func SendMsg(param *Message, sendStatus int, loginUserName string, loginUserId i
 			"send_userid": loginUserId,
 			"send_name":   loginUserName,
 			"sign":        0,
+			"update_user": loginUserName,
 		})
 		msgLogId = strconv.FormatInt(msgId, 10)
 		//如果是定时发送