Browse Source

Merge branch 'bug/5664' into debug

Roc 8 months ago
parent
commit
ff72d710d9
1 changed files with 5 additions and 5 deletions
  1. 5 5
      controllers/target.go

+ 5 - 5
controllers/target.go

@@ -964,7 +964,7 @@ func (this *TargetController) ExportDataList() {
 	keyWord := this.GetString("KeyWord")
 	startDate := this.GetString("StartDate")
 	endDate := this.GetString("EndDate")
-	//frequency := this.GetString("Frequency")
+	frequency := this.GetString("Frequency")
 	classifyId, _ := this.GetInt("ClassifyId") //分类
 	mobile := this.GetString("Mobile")         //分类
 	tradeCode := this.GetString("TradeCode")   //指标唯一编码
@@ -989,10 +989,10 @@ func (this *TargetController) ExportDataList() {
 		condition += ` AND c.DT <= ? `
 		pars = append(pars, endDate)
 	}
-	//if frequency != "" {
-	//	condition += ` AND a.frequency = ? `
-	//	pars = append(pars, frequency)
-	//}
+	if frequency != "" {
+		condition += ` AND a.frequency = ? `
+		pars = append(pars, frequency)
+	}
 	permissionUserId := sysUser.AdminId
 	if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_ADMIN {
 		permissionUserId = 0