Merge branch 'fix_bug_2021_09_13_17_20' of hongze/hongze_cygx into master

controllers/activity.go

@@ -90,6 +90,22 @@ func (this *ActivityCoAntroller) ActivityList() {
 	keyWord := this.GetString("KeyWord")
 	activeState := this.GetString("ActiveState")
 	label := this.GetString("Label")
+	//入参为 undefined 时的处理
+	if chartPermissionIds == "undefined" {
+		chartPermissionIds = ""
+	}
+	if activityTypeIds == "undefined" {
+		activityTypeIds = ""
+	}
+	if whichDay == "undefined" {
+		whichDay = ""
+	}
+	if activeState == "undefined" {
+		activeState = ""
+	}
+	if label == "undefined" {
+		label = ""
+	}
 
 	itemSearch := new(models.CygxActivityUserSearchContent)
 	itemSearch.UserId = uid
@@ -1603,6 +1619,23 @@ func (this *ActivityCoAntroller) LabelList() {
 	isShowJurisdiction, _ := this.GetInt("IsShowJurisdiction")
 	activeState := this.GetString("ActiveState")
 	label := this.GetString("Label")
+
+	//入参为 undefined 时的处理
+	if chartPermissionIds == "undefined" {
+		chartPermissionIds = ""
+	}
+	if activityTypeIds == "undefined" {
+		activityTypeIds = ""
+	}
+	if whichDay == "undefined" {
+		whichDay = ""
+	}
+	if activeState == "undefined" {
+		activeState = ""
+	}
+	if label == "undefined" {
+		label = ""
+	}
 	var userType int
 	var permissionStr string
 	if user.CompanyId <= 1 {