|
@@ -82,7 +82,7 @@ var Str = "a.send_usergroup_name,a.msg_type,a.title,a.content,a.send_mode,a.send
|
|
|
func MsgList(param *MsgListParam, isLookAllMsg, loginUserId int, loginUserName string) (*[]map[string]interface{}, int) {
|
|
|
sql := "SELECT DISTINCT(a.id)," + Str + " FROM message_send_log as a LEFT JOIN sendmsg_customer_info as b on a.id = b.msg_id "
|
|
|
str := ""
|
|
|
- sqlc := "SELECT DISTINCT(COUNt(*)) FROM message_send_log as a LEFT JOIN sendmsg_customer_info as b on a.id = b.msg_id "
|
|
|
+ sqlc := "SELECT COUNT(DISTINCT a.id) FROM message_send_log as a LEFT JOIN sendmsg_customer_info as b on a.id = b.msg_id "
|
|
|
if param.UserGroupName != "" {
|
|
|
if param.UserGroupName == "自定义" {
|
|
|
str += " a.sign = 1 and"
|
|
@@ -115,8 +115,9 @@ func MsgList(param *MsgListParam, isLookAllMsg, loginUserId int, loginUserName s
|
|
|
if isLookAllMsg == 0 {
|
|
|
str += " a.send_userid = " + strconv.Itoa(loginUserId) + " and"
|
|
|
} else if isLookAllMsg == 1 {
|
|
|
+ log.Println("查询创建人为:", param.Creator)
|
|
|
if param.Creator != "" {
|
|
|
- str += " a.send_name = '" + loginUserName + "' and"
|
|
|
+ str += " a.send_name = '" + param.Creator + "' and"
|
|
|
}
|
|
|
}
|
|
|
if param.Phone != "" {
|