luckdraw

service/luckdrawlist/luckdrawlist.go

@@ -30,13 +30,7 @@ func (s *LuckdrawlistServ) GetLuckShareList(caseID, fromPhone, toPhone string, p
 			return nil, 0, err
 		}
 
-<<<<<<< HEAD
-		filters = []string{
-			"case_id='" + caseID + "'",
-		}
-=======
 		filters = "a.case_id='" + caseID + "'"
->>>>>>> f643ac3515ca8d062ef23fecb4d225165f2e3b76
 	} else {
 		casesRaw := s.ctx.Get("cases")
 		if casesRaw == nil {
@@ -49,13 +43,7 @@ func (s *LuckdrawlistServ) GetLuckShareList(caseID, fromPhone, toPhone string, p
 			caseIDs = append(caseIDs, cs.CaseId)
 		}
 
-<<<<<<< HEAD
-		filters = []string{
-			"case_id in ('" + strings.Join(caseIDs, "','") + "')",
-		}
-=======
 		filters = "a.case_id in ('" + strings.Join(caseIDs, "','") + "')"
->>>>>>> f643ac3515ca8d062ef23fecb4d225165f2e3b76
 	}
 
 	limit := utils.GetPageNaviLimit(pagenavi...)