Browse Source

Merge branch 'debug' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

hongze 1 year ago
parent
commit
9590637c56
1 changed files with 17 additions and 0 deletions
  1. 17 0
      controllers/company.go

+ 17 - 0
controllers/company.go

@@ -1588,6 +1588,17 @@ func (this *CompanyController) List() {
 		statusItems = append(statusItems, s)
 	}
 
+	sysUserList, err := system.GetAdminList()
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取admin列表失败, Err:" + err.Error()
+		return
+	}
+	adminMap := make(map[int]*system.Admin, 0)
+	for _, v := range sysUserList {
+		adminMap[v.AdminId] = v
+	}
+
 	companyLists := make([]*company.CompanyListItem, 0)
 	//查询阅读次数
 	if list == nil {
@@ -1755,6 +1766,12 @@ func (this *CompanyController) List() {
 				ShareSeller:     v.ShareSeller,
 				ShareSellerId:   v.ShareSellerId,
 			}
+			if v.ShareSellerId != 0 {
+				shareSeller := adminMap[v.ShareSellerId]
+				if shareSeller != nil {
+					companyList.ShareSeller = shareSeller.RealName + "(" + shareSeller.GroupName + ")"
+				}
+			}
 			companyLists = append(companyLists, companyList)
 		}
 	}