|
@@ -697,11 +697,13 @@ func ActivityAttendanceDetail(cont context.Context) (err error) {
|
|
|
}
|
|
|
for k, v := range needAddAttendanc {
|
|
|
for _, v2 := range listUser {
|
|
|
- if v2.OutboundMobile == v.Mobile {
|
|
|
- needAddAttendanc[k].CompanyId = v2.CompanyId
|
|
|
- needAddAttendanc[k].SellerName = v2.SellerName
|
|
|
- needAddAttendanc[k].CompanyName = v2.CompanyName
|
|
|
- needAddAttendanc[k].IsMeetingStr = 1
|
|
|
+ if v2.OutboundMobile == v.Mobile || v2.Mobile == v.Mobile {
|
|
|
+ if needAddAttendanc[k].CompanyId == 0 {
|
|
|
+ needAddAttendanc[k].CompanyId = v2.CompanyId
|
|
|
+ needAddAttendanc[k].SellerName = v2.SellerName
|
|
|
+ needAddAttendanc[k].CompanyName = v2.CompanyName
|
|
|
+ needAddAttendanc[k].IsMeetingStr = 1
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -797,11 +799,13 @@ func ActivityAttendanceDetail(cont context.Context) (err error) {
|
|
|
}
|
|
|
for k, v := range needAddAttendanc {
|
|
|
for _, v2 := range listUser {
|
|
|
- if v2.OutboundMobile == v.Mobile {
|
|
|
- needAddAttendanc[k].CompanyId = v2.CompanyId
|
|
|
- needAddAttendanc[k].SellerName = v2.SellerName
|
|
|
- needAddAttendanc[k].CompanyName = v2.CompanyName
|
|
|
- needAddAttendanc[k].IsMeetingStr = 1
|
|
|
+ if v2.OutboundMobile == v.Mobile || v2.Mobile == v.Mobile {
|
|
|
+ if needAddAttendanc[k].CompanyId == 0 {
|
|
|
+ needAddAttendanc[k].CompanyId = v2.CompanyId
|
|
|
+ needAddAttendanc[k].SellerName = v2.SellerName
|
|
|
+ needAddAttendanc[k].CompanyName = v2.CompanyName
|
|
|
+ needAddAttendanc[k].IsMeetingStr = 1
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|