Merge remote-tracking branch 'origin/master'

rule/public_platoon_user_relation_commission.go

@@ -118,6 +118,9 @@ func PublicPlatoon(engine *xorm.Engine, uid, recommendUid int64, PublicPlatoonBa
 	if err != nil {
 		return model.PublicPlatoonUserRelation{}, err
 	}
+	if m == nil {
+		return model.PublicPlatoonUserRelation{}, errors.New("未查询到推荐人记录")
+	}
 
 	//2、 查找当前 public_platoon_user_relation 中 recommendUid 所有的子记录
 	PublicPlatoonUserRelations, err := publicPlatoonUserRelationDb.PublicPlatoonUserRelationFindByPid(m.Uid, "father_uid1", "position1")