|
@@ -284,10 +284,10 @@ func MarkGroupApplyRecord(applyRecordId, adminId, userId int, groupName string)
|
|
|
}
|
|
|
return
|
|
|
}
|
|
|
- if applyRecord.OpStatus != 0 {
|
|
|
- err = errors.New(fmt.Sprint("申请记录处理状态有误:", err))
|
|
|
- return
|
|
|
- }
|
|
|
+ //if applyRecord.OpStatus != 0 {
|
|
|
+ // err = errors.New(fmt.Sprint("申请记录处理状态有误:", err))
|
|
|
+ // return
|
|
|
+ //}
|
|
|
if userId > 0 && userId != applyRecord.UserId {
|
|
|
err = errors.New(fmt.Sprint("申请记录ID与用户ID不匹配:", err))
|
|
|
return
|
|
@@ -317,7 +317,7 @@ func MarkGroupApplyRecord(applyRecordId, adminId, userId int, groupName string)
|
|
|
return
|
|
|
}
|
|
|
// 未处理过则进行标记
|
|
|
- if wxUser.IsDeal == 0 {
|
|
|
+ if wxUser.IsDeal == 0 || wxUser.MarkGroup == "" {
|
|
|
wxUser.IsDeal = 1
|
|
|
wxUser.MarkGroup = groupName
|
|
|
wxUser.LastUpdatedTime = time.Now()
|