update
continuous-integration/drone/push Build is passing Details

master
kgdxpr 4 years ago
parent b1ede1f6ec
commit 70ba7bd8f1

@ -4,9 +4,6 @@
<list default="true" id="19c8c37d-a056-451c-a29d-fb612b9a3e2f" name="Default Changelist" comment=""> <list default="true" id="19c8c37d-a056-451c-a29d-fb612b9a3e2f" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Business/ImRelate/ImRelateDao/ImRelateDao.go" beforeDir="false" afterPath="$PROJECT_DIR$/Business/ImRelate/ImRelateDao/ImRelateDao.go" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Business/ImRelate/ImRelateDao/ImRelateDao.go" beforeDir="false" afterPath="$PROJECT_DIR$/Business/ImRelate/ImRelateDao/ImRelateDao.go" afterDir="false" />
<change beforePath="$PROJECT_DIR$/docs/docs.go" beforeDir="false" afterPath="$PROJECT_DIR$/docs/docs.go" afterDir="false" />
<change beforePath="$PROJECT_DIR$/docs/swagger.json" beforeDir="false" afterPath="$PROJECT_DIR$/docs/swagger.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/docs/swagger.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/docs/swagger.yaml" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -113,15 +110,4 @@
</map> </map>
</environment> </environment>
</component> </component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="DlvLineBreakpoint">
<url>file://$PROJECT_DIR$/Business/ImRelate/ImRelateDao/ImRelateDao.go</url>
<line>418</line>
<option name="timeStamp" value="9" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component>
</project> </project>

@ -71,8 +71,8 @@ type ChatRecordStruct struct {
*/ */
func GetPersonAvatar(personId string, identityId string, serverLocation string) string { func GetPersonAvatar(personId string, identityId string, serverLocation string) string {
fileId, extension := GetPersonAvatarFileId(personId, identityId) fileId, extension := GetPersonAvatarFileId(personId, identityId)
url:="" url := ""
if fileId!="EA0BC5FB-52D9-E232-D3E3-E6C2960B5739"{ if fileId != "EA0BC5FB-52D9-E232-D3E3-E6C2960B5739" {
url = GetPersonAvatarUrl(fileId, extension, serverLocation) url = GetPersonAvatarUrl(fileId, extension, serverLocation)
} }
return url return url
@ -413,7 +413,6 @@ func GetPersonList(bureauId string, orgId string, queryChild string, bUse string
for i := 0; i < len(p.List); i++ { for i := 0; i < len(p.List); i++ {
personId := p.List[i].PersonId personId := p.List[i].PersonId
identityId := p.List[i].IdentityId identityId := p.List[i].IdentityId
fmt.Println(personId)
p.List[i].AvatarUrl = GetPersonAvatar(personId, identityId, serverLocation) p.List[i].AvatarUrl = GetPersonAvatar(personId, identityId, serverLocation)
} }
jsonBytes, err := json.Marshal(p) jsonBytes, err := json.Marshal(p)

Loading…
Cancel
Save