- 修复dao.GetUserList的bug

- QueryActs添加参数syncStatus

controllers/act.go

@@ -128,6 +128,7 @@ func (c *ActController) CreateAct() {
 // @Param	createTypeList	query		string	false	"创建方式列表"
 // @Param	storeID			query		int		false	"包含门店"
 // @Param	skuID			query		int		false	"包含sku"
+// @Param	syncStatus		query		int		false	"活动同步标识，缺省不限制"
 // @Param	offset			query		int		false	"活动列表起始序号（以0开始，缺省为0）"
 // @Param	pageSize		query		int		false	"活动列表页大小（缺省为50，-1表示全部）"
 // @Success 200 {object} controllers.CallResult
@@ -142,7 +143,10 @@ func (c *ActController) QueryActs() {
 				if params.MapData["vendorID"] == nil {
 					params.VendorID = -1
 				}
-				retVal, err = act.QueryActs(params.Ctx, params.ActID, params.Offset, params.PageSize, params.Keyword, params.VendorID,
+				if params.MapData["syncStatus"] == nil {
+					params.SyncStatus = -1
+				}
+				retVal, err = act.QueryActs(params.Ctx, params.ActID, params.Offset, params.PageSize, params.SyncStatus, params.Keyword, params.VendorID,
 					statusList, typeList, createTypeList, params.StoreID, params.SkuID, params.CityCode, timeList[2], timeList[3], timeList[0], timeList[1])
 			}
 		}