update

dsSzxy/.idea/workspace.xml

@@ -3,8 +3,10 @@
   <component name="ChangeListManager">
     <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$/Business/ImRelate/ImRelateController/ImRelateController.go" beforeDir="false" afterPath="$PROJECT_DIR$/Business/ImRelate/ImRelateController/ImRelateController.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Config/Config.ini" beforeDir="false" afterPath="$PROJECT_DIR$/Config/Config.ini" 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>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -52,6 +54,15 @@
     </key>
   </component>
   <component name="RunManager" selected="Go Build.go build main.go">
+    <configuration name="go build XltraSwag.go" type="GoApplicationRunConfiguration" factoryName="Go Application" temporary="true" nameIsGenerated="true">
+      <module name="dsSzxy" />
+      <working_directory value="$PROJECT_DIR$" />
+      <kind value="FILE" />
+      <filePath value="$PROJECT_DIR$/Tools/XltraSwag.go" />
+      <package value="dsSzxy" />
+      <directory value="$PROJECT_DIR$" />
+      <method v="2" />
+    </configuration>
     <configuration name="go build dsSzxy" type="GoApplicationRunConfiguration" factoryName="Go Application" temporary="true" nameIsGenerated="true">
       <module name="dsSzxy" />
       <working_directory value="$PROJECT_DIR$" />
@@ -73,6 +84,7 @@
     <recent_temporary>
       <list>
         <item itemvalue="Go Build.go build main.go" />
+        <item itemvalue="Go Build.go build XltraSwag.go" />
         <item itemvalue="Go Build.go build dsSzxy" />
       </list>
     </recent_temporary>
@@ -101,4 +113,15 @@
       </map>
     </environment>
   </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>

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)