diff --git a/dsSzxy/.idea/workspace.xml b/dsSzxy/.idea/workspace.xml
index ece9ae46..e08af204 100644
--- a/dsSzxy/.idea/workspace.xml
+++ b/dsSzxy/.idea/workspace.xml
@@ -3,8 +3,10 @@
-
-
+
+
+
+
@@ -52,6 +54,15 @@
+
+
+
+
+
+
+
+
+
@@ -73,6 +84,7 @@
+
@@ -101,4 +113,15 @@
+
+
+
+
+ file://$PROJECT_DIR$/Business/ImRelate/ImRelateDao/ImRelateDao.go
+ 418
+
+
+
+
+
\ No newline at end of file
diff --git a/dsSzxy/Business/ImRelate/ImRelateDao/ImRelateDao.go b/dsSzxy/Business/ImRelate/ImRelateDao/ImRelateDao.go
index f6b9971b..92eda4d6 100644
--- a/dsSzxy/Business/ImRelate/ImRelateDao/ImRelateDao.go
+++ b/dsSzxy/Business/ImRelate/ImRelateDao/ImRelateDao.go
@@ -71,7 +71,10 @@ type ChatRecordStruct struct {
*/
func GetPersonAvatar(personId string, identityId string, serverLocation string) string {
fileId, extension := GetPersonAvatarFileId(personId, identityId)
- url := GetPersonAvatarUrl(fileId, extension, serverLocation)
+ url:=""
+ if fileId!="EA0BC5FB-52D9-E232-D3E3-E6C2960B5739"{
+ url = GetPersonAvatarUrl(fileId, extension, serverLocation)
+ }
return url
}
@@ -100,6 +103,9 @@ func GetPersonAvatarFileId(personId string, identityId string) (string, string)
return fileId, extension
}
avatarId := fmt.Sprintf("%v", jsonObj["space_avatar_fileid"])
+ if len(avatarId) == 0 {
+ return fileId, extension
+ }
arr := strings.Split(avatarId, ".")
return arr[0], arr[1]
}
@@ -381,7 +387,7 @@ func GetServerLocation() string {
return CommonUtil.ConvertInterfaceToString(resObj["common.server.location"])
}
-func GetPersonList(bureauId string, orgId string, queryChild string, bUse string, personName string, queryBureauChild string,pageNumber string, pageSize string) (string, error) {
+func GetPersonList(bureauId string, orgId string, queryChild string, bUse string, personName string, queryBureauChild string, pageNumber string, pageSize string) (string, error) {
req := httplib.Get(fmt.Sprintf("%s/dsideal_yy/admin/new_base/personInfo_GetPersonInfoList", ConfigUtil.DsidealYy))
req.Param("bureau_id", bureauId)
@@ -407,6 +413,7 @@ func GetPersonList(bureauId string, orgId string, queryChild string, bUse string
for i := 0; i < len(p.List); i++ {
personId := p.List[i].PersonId
identityId := p.List[i].IdentityId
+ fmt.Println(personId)
p.List[i].AvatarUrl = GetPersonAvatar(personId, identityId, serverLocation)
}
jsonBytes, err := json.Marshal(p)