Merge branch 'dev/v1.2.6_dx' of SocialPlatform/messageCenter into feature/v1.2.6

service/chat_group.go

@@ -32,8 +32,12 @@ func EntPerson(entId int64, isAll bool) (map[string]string, map[string]string, m
 		}, "", `{"name":1,"phone":1}`, false, -1, -1)
 		if departData != nil && len(*departData) > 0 {
 			for _, v := range *departData {
-				phoneData[common.InterfaceToStr(v["phone"])] = common.InterfaceToStr(v["name"])
-				nameData[common.InterfaceToStr(v["name"])] = common.InterfaceToStr(v["phone"])
+				if phoneData[common.InterfaceToStr(v["phone"])] == "" {
+					phoneData[common.InterfaceToStr(v["phone"])] = common.InterfaceToStr(v["name"])
+				}
+				if nameData[common.InterfaceToStr(v["name"])] == "" {
+					nameData[common.InterfaceToStr(v["name"])] = common.InterfaceToStr(v["phone"])
+				}
 			}
 		}
 		//查询企业人员职位