diff --git a/app/admin/models/erp_order.go b/app/admin/models/erp_order.go
index 8d91a43..415f39b 100644
--- a/app/admin/models/erp_order.go
+++ b/app/admin/models/erp_order.go
@@ -1977,7 +1977,10 @@ func (m *ErpOrder) SetOrderSalesman() error {
 		if err != nil {
 			logger.Error("GetSysUserInfoByUid err:", logger.Field("err", err))
 		}
-		item.Name = userInfo.NickName
+		if userInfo.UserId != 0 {
+			item.Name = userInfo.NickName
+		}
+
 		item.SalesmanPer = totalStaffProfit * userInfo.SalesCommRate * 0.01 / float64(len(salesmanInfo))
 
 		//if m.RetailType == RetailTypeRejected {
diff --git a/app/admin/models/user.go b/app/admin/models/user.go
index 140b61e..ff5911b 100644
--- a/app/admin/models/user.go
+++ b/app/admin/models/user.go
@@ -1606,12 +1606,14 @@ func (m *NewUserInviteRecordReq) NewList(c *gin.Context) (*UserInviteRecordListR
 
 	qs := orm.Eloquent.Table("user_invite_record").Where("action=2")
 	countQuery := orm.Eloquent.Table("user_invite_record").Where("action=2").
-		Select("user_invite_record.*, B1.nick_name AS InviteUserName, " +
+		Select("user_invite_record.*, " +
+			"COALESCE(SU.nick_name, U.shop_assistant_name) AS InviteUserName, " +
 			"B2.tel AS UserTel, B2.created_at AS CreateTime, B2.member_expire AS MemberExpire, B2.member_level AS UserMemberLevel, " +
 			"B3.member_expire AS PrivilegeMemberExpire, B3.member_level AS PrivilegeMemberLevel").
-		Joins("Left JOIN sys_user B1 ON user_invite_record.from_uid = B1.uid and B1.uid != 0").
-		Joins("Left JOIN user B2 ON user_invite_record.to_uid = B2.uid").
-		Joins("Left JOIN privilege_member B3 ON user_invite_record.to_uid = B3.uid").
+		Joins("LEFT JOIN sys_user SU ON user_invite_record.from_uid = SU.uid AND SU.uid != 0").
+		Joins("LEFT JOIN user U ON user_invite_record.from_uid = U.uid AND SU.uid IS NULL"). // 仅在 sys_user 为空时使用 user
+		Joins("LEFT JOIN user B2 ON user_invite_record.to_uid = B2.uid").
+		Joins("LEFT JOIN privilege_member B3 ON user_invite_record.to_uid = B3.uid").
 		Group("user_invite_record.id").
 		Order("MAX(user_invite_record.action_time) DESC")
 
@@ -1648,8 +1650,8 @@ func (m *NewUserInviteRecordReq) NewList(c *gin.Context) (*UserInviteRecordListR
 		countQuery = countQuery.Where("user_invite_record.store_id=?", m.StoreId)
 	}
 	if m.InviteUserName != "" {
-		qs = qs.Where("B1.nick_name=?", m.InviteUserName)
-		countQuery = countQuery.Where("B1.nick_name=?", m.InviteUserName)
+		qs = qs.Where("B1.shop_assistant_name=?", m.InviteUserName)
+		countQuery = countQuery.Where("B1.shop_assistant_name=?", m.InviteUserName)
 	}
 	if m.FromUid != 0 {
 		qs = qs.Where("user_invite_record.from_uid=?", m.FromUid)
@@ -1757,12 +1759,14 @@ func (m *NewUserInviteRecordReq) NewList(c *gin.Context) (*UserInviteRecordListR
 	}
 
 	if m.IsExport == 1 { // 导出excel
-		err = qs.Select("user_invite_record.*,  B1.nick_name AS InviteUserName, " +
+		err = qs.Select("user_invite_record.*, " +
+			"COALESCE(SU.nick_name, U.shop_assistant_name) AS InviteUserName, " +
 			"B2.tel AS UserTel, B2.created_at AS CreateTime, B2.member_expire AS MemberExpire, B2.member_level AS UserMemberLevel, " +
 			"B3.member_expire AS PrivilegeMemberExpire, B3.member_level AS PrivilegeMemberLevel").
-			Joins("Left JOIN sys_user B1 ON user_invite_record.from_uid = B1.uid and B1.uid != 0").
-			Joins("Left JOIN user B2 ON user_invite_record.to_uid = B2.uid").
-			Joins("Left JOIN privilege_member B3 ON user_invite_record.to_uid = B3.uid").
+			Joins("LEFT JOIN sys_user SU ON user_invite_record.from_uid = SU.uid AND SU.uid != 0").
+			Joins("LEFT JOIN user U ON user_invite_record.from_uid = U.uid AND SU.uid IS NULL"). // 仅在 sys_user 为空时使用 user
+			Joins("LEFT JOIN user B2 ON user_invite_record.to_uid = B2.uid").
+			Joins("LEFT JOIN privilege_member B3 ON user_invite_record.to_uid = B3.uid").
 			Group("user_invite_record.id").
 			Order("MAX(user_invite_record.action_time) DESC").
 			Find(&records).Error
@@ -1771,12 +1775,14 @@ func (m *NewUserInviteRecordReq) NewList(c *gin.Context) (*UserInviteRecordListR
 			return nil, err
 		}
 	} else {
-		err = qs.Select("user_invite_record.*,  B1.nick_name AS InviteUserName, " +
+		err = qs.Select("user_invite_record.*, " +
+			"COALESCE(SU.nick_name, U.shop_assistant_name) AS InviteUserName, " +
 			"B2.tel AS UserTel, B2.created_at AS CreateTime, B2.member_expire AS MemberExpire, B2.member_level AS UserMemberLevel, " +
 			"B3.member_expire AS PrivilegeMemberExpire, B3.member_level AS PrivilegeMemberLevel").
-			Joins("Left JOIN sys_user B1 ON user_invite_record.from_uid = B1.uid and B1.uid != 0").
-			Joins("Left JOIN user B2 ON user_invite_record.to_uid = B2.uid").
-			Joins("Left JOIN privilege_member B3 ON user_invite_record.to_uid = B3.uid").
+			Joins("LEFT JOIN sys_user SU ON user_invite_record.from_uid = SU.uid AND SU.uid != 0").
+			Joins("LEFT JOIN user U ON user_invite_record.from_uid = U.uid AND SU.uid IS NULL"). // 仅在 sys_user 为空时使用 user
+			Joins("LEFT JOIN user B2 ON user_invite_record.to_uid = B2.uid").
+			Joins("LEFT JOIN privilege_member B3 ON user_invite_record.to_uid = B3.uid").
 			Group("user_invite_record.id").
 			Order("MAX(user_invite_record.action_time) DESC").
 			Offset(page * pageSize).