|
@@ -126,7 +126,7 @@ func (b MessaggeService) UserList(in *messagecenter.UserReq) (data *[]map[string
|
|
if in.NameSearch == "" || oneNameSql != "" {
|
|
if in.NameSearch == "" || oneNameSql != "" {
|
|
oneSql = fmt.Sprintf(`(SELECT
|
|
oneSql = fmt.Sprintf(`(SELECT
|
|
a.your_position_id AS id,
|
|
a.your_position_id AS id,
|
|
- 1 AS userType,
|
|
|
|
|
|
+ 2 AS userType,
|
|
c.nickname AS name,
|
|
c.nickname AS name,
|
|
c.headimg,
|
|
c.headimg,
|
|
d.content,
|
|
d.content,
|
|
@@ -149,7 +149,7 @@ func (b MessaggeService) UserList(in *messagecenter.UserReq) (data *[]map[string
|
|
serviceSql := fmt.Sprintf(` (
|
|
serviceSql := fmt.Sprintf(` (
|
|
SELECT
|
|
SELECT
|
|
a.ent_id AS id,
|
|
a.ent_id AS id,
|
|
- 2 AS userType,
|
|
|
|
|
|
+ 1 AS userType,
|
|
b.nickname AS name,
|
|
b.nickname AS name,
|
|
b.headimage as headimg,
|
|
b.headimage as headimg,
|
|
c.content,
|
|
c.content,
|