|
@@ -107,7 +107,7 @@ func (b MessaggeService) UserList(in *messagecenter.UserReq) (data *[]map[string
|
|
|
if positionIdArr != "" {
|
|
if positionIdArr != "" {
|
|
|
oneNameSql = " AND find_in_set(b.id,'" + positionIdArr + "')" //1v1搜索成员id
|
|
oneNameSql = " AND find_in_set(b.id,'" + positionIdArr + "')" //1v1搜索成员id
|
|
|
//存在满足成员名时 重新定义搜索sql 并兼容群名称不满足但成员名满足时也展示 并展示部分满足群员名
|
|
//存在满足成员名时 重新定义搜索sql 并兼容群名称不满足但成员名满足时也展示 并展示部分满足群员名
|
|
|
- name := fmt.Sprintf(" AND c.position_id IN ( %s ) or b.name like '%"+in.NameSearch+"%'", positionIdArr)
|
|
|
|
|
|
|
+ name := fmt.Sprintf(" AND (c.position_id IN ( %s ) or b.name like '%"+in.NameSearch+"%')", positionIdArr)
|
|
|
GroupNameSql = fmt.Sprintf(` (
|
|
GroupNameSql = fmt.Sprintf(` (
|
|
|
SELECT
|
|
SELECT
|
|
|
a.chat_group_id as id,
|
|
a.chat_group_id as id,
|
|
@@ -189,7 +189,8 @@ func (b MessaggeService) UserList(in *messagecenter.UserReq) (data *[]map[string
|
|
|
switch in.QueryType {
|
|
switch in.QueryType {
|
|
|
case 1: //分享列表
|
|
case 1: //分享列表
|
|
|
allSql = strings.Join(append(sqlArr, oneSql, groupSql), " UNION ALL ")
|
|
allSql = strings.Join(append(sqlArr, oneSql, groupSql), " UNION ALL ")
|
|
|
- case 2: //历史会话列表
|
|
|
|
|
|
|
+ default:
|
|
|
|
|
+ //历史会话列表
|
|
|
allSql = strings.Join(append(sqlArr, oneSql, groupSql, serviceSql), " UNION ALL ")
|
|
allSql = strings.Join(append(sqlArr, oneSql, groupSql, serviceSql), " UNION ALL ")
|
|
|
}
|
|
}
|
|
|
sqlStr = fmt.Sprintf(`SELECT * FROM(
|
|
sqlStr = fmt.Sprintf(`SELECT * FROM(
|
