@@ -374,9 +374,6 @@ func (this *ApplyRecordController) UserApplyList() {
} else if v.Email != "" {
emailsSlice = append(emailsSlice, v.Email)
}
- if v.MarkGroup == "" {
- v.OpStatus = 0
- }
//统计申请数
userApplyTotalMap := make(map[int]int)
@@ -158,7 +158,7 @@ SELECT
y.is_move,
y.source,
y.from_page,
- IF(y.mark_group = '' OR y.mark_group IS NULL, a.mark_group, y.mark_group) AS mark_group,
+ IF(y.mark_group = '' OR y.mark_group IS NULL OR y.apply_record_id = 0 OR y.apply_record_id IS NULL , a.mark_group, y.mark_group) AS mark_group,
y.company_name as user_company_name
#bp.seller_id,
#bp.seller_name