Merge branch 'small_282' into debug

# Conflicts:
#	controllers/statistic_report.go

controllers/statistic_report.go

@@ -5785,8 +5785,8 @@ func (this *StatisticReportController) InvoicePaymentList() {
 		sellerIdsList := conf.ConfigValue
 
 		cond += ` AND (c.seller_id IN (` + sellerIdsList + `) OR d.seller_id IN (` + sellerIdsList + `))`
-		pars = append(pars, sysUser.AdminId, sysUser.AdminId)
-	} else if sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_ADMIN { 
+		pars = append(pars)
+	} else if sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_ADMIN {
 		cond += ` AND (c.seller_id=? OR d.seller_id=?)`
 		pars = append(pars, sysUser.AdminId, sysUser.AdminId)
 	}