no message

controllers/cygx/rai_serve.go

@@ -134,10 +134,7 @@ func (this *RaiServeCoAntroller) SearchTagCalendar() {
 		return
 	}
 	keyWord := this.GetString("KeyWord")
-	if keyWord == "" {
-		br.Msg = "请输入搜索关键词"
-		return
-	}
+
 	researcherId := this.GetString("ResearcherId")
 	askEmailList, err := cygx.GetAskEmailListByAdminIds(researcherId)
 	if err != nil {
@@ -154,14 +151,14 @@ func (this *RaiServeCoAntroller) SearchTagCalendar() {
 			hasCelue = true
 		}
 	}
+
 	var list []*cygx.RaiServeTagResp
 	resp := new(cygx.RaiServeTagListResp)
 	if hasCelue {
 		var condition string
 		var pars []interface{}
 		keyWord = "%" + keyWord + "%"
-		condition = ` AND  product_id  = 2 AND  permission_name  IN ('策略')   AND permission_name LIKE ?  `
-		pars = append(pars, keyWord)
+		condition = ` AND  product_id  = 2 AND  permission_name  IN ('策略')   `
 		listChartPermission, err := models.GetChartPermissionListByCondition(condition, pars)
 		if err != nil {
 			br.Msg = "获取失败"
@@ -176,6 +173,10 @@ func (this *RaiServeCoAntroller) SearchTagCalendar() {
 			list = append(list, item)
 		}
 	} else {
+		if keyWord == "" {
+			br.Msg = "请输入搜索关键词"
+			return
+		}
 		var permissionNameSql []string
 		for _, v := range permissionName {
 			permissionNameSql = append(permissionNameSql, "'"+v+"'")