Browse Source

扫描出的有问题的语法

xyxie 1 week ago
parent
commit
43ac0518b2

+ 1 - 1
controllers/data_manage/excel/balance_table.go

@@ -951,7 +951,7 @@ func (c *ExcelInfoController) BalanceSeasonChartLegendPreview() {
 		return
 	}
 
-	if len(req.DateArr) == 0 || len(req.DateArr) == 0 || len(req.DateArr) != len(req.DataArr) {
+	if len(req.DateArr) == 0 || len(req.DataArr) == 0 || len(req.DateArr) != len(req.DataArr) {
 		br.Msg = "请输入正确的日期和数据"
 		return
 	}

+ 5 - 5
controllers/material/material.go

@@ -1127,7 +1127,7 @@ func (this *MaterialController) BatchDelete() {
 			return
 		}
 		notSelectIds := make(map[int]struct{})
-		if len(req.MaterialIds) >= 0 {
+		if len(req.MaterialIds) > 0 {
 			for _, v := range req.MaterialIds {
 				notSelectIds[v] = struct{}{}
 			}
@@ -1141,7 +1141,7 @@ func (this *MaterialController) BatchDelete() {
 		deleteMaterialIds = req.MaterialIds
 	}
 
-	if len(deleteMaterialIds) <= 0 {
+	if len(deleteMaterialIds) == 0 {
 		br.Msg = "请选择删除的素材"
 		return
 	}
@@ -1462,7 +1462,7 @@ func (this *MaterialController) BatchChangeClassify() {
 			return
 		}
 		notSelectIds := make(map[int]struct{})
-		if len(req.MaterialIds) >= 0 {
+		if len(req.MaterialIds) > 0 {
 			for _, v := range req.MaterialIds {
 				notSelectIds[v] = struct{}{}
 			}
@@ -1476,7 +1476,7 @@ func (this *MaterialController) BatchChangeClassify() {
 		updateMaterialIds = req.MaterialIds
 	}
 
-	if len(updateMaterialIds) <= 0 {
+	if len(updateMaterialIds) == 0 {
 		br.Msg = "请选择变更的素材"
 		return
 	}
@@ -1717,7 +1717,7 @@ func (this *MaterialController) BatchDownload() {
 			return
 		}
 		notSelectIds := make(map[int]struct{})
-		if len(materialIds) >= 0 {
+		if len(materialIds) > 0 {
 			//转成数组
 			for _, v := range materialIds {
 				id, _ := strconv.Atoi(v)

+ 1 - 0
controllers/roadshow/calendar.go

@@ -40,6 +40,7 @@ func (this *CalendarController) ResearcherList() {
 			findItems = append(findItems, v)
 			groupMap[v.GroupId] = findItems
 		} else {
+			findItems := make([]*roadshow.Researcher, 0)
 			findItems = append(findItems, v)
 			groupMap[v.GroupId] = findItems
 		}

+ 1 - 1
models/ppt_english/report_ppt_english_img.go

@@ -18,7 +18,7 @@ type ReportPptEnglishImg struct {
 
 // AddAndEditMultiReportPptEnglishImg 批量添加Ppt转报告的图片记录
 func AddAndEditMultiReportPptEnglishImg(pptId int, reportPptEnglishImgList []*ReportPptEnglishImg) (err error) {
-	if len(reportPptEnglishImgList) < 0 {
+	if len(reportPptEnglishImgList) == 0 {
 		return
 	}
 	o := global.DbMap[utils.DbNameReport]

+ 1 - 1
models/report_ppt_img.go

@@ -18,7 +18,7 @@ type ReportPptImg struct {
 
 // AddAndEditMultiReportPptImg 批量添加Ppt转报告的图片记录
 func AddAndEditMultiReportPptImg(pptId int, reportPptImgList []*ReportPptImg) (err error) {
-	if len(reportPptImgList) < 0 {
+	if len(reportPptImgList) == 0 {
 		return
 	}
 	to := global.DbMap[utils.DbNameReport].Begin()

+ 0 - 1
services/binlog/binlog.go

@@ -193,7 +193,6 @@ func getBinlogNamePosition() (fileName string, position uint32, err error) {
 	if err != nil {
 		if err.Error() != utils.RedisNoKeyErr {
 			panic("mysql binlog position is not found,err:" + err.Error())
-			return
 		}
 		err = nil
 	}

+ 0 - 6
services/data/chart_info.go

@@ -813,8 +813,6 @@ func getEdbDataMapList(chartInfoId, chartType int, calendar, startDate, endDate
 				item.IsNullData = true
 				edbList = append(edbList, item)
 				continue
-				err = errors.New(fmt.Sprint("获取最后实际数据的日期失败,Err:" + tmpErr.Error() + ";LatestDate:" + v.LatestDate))
-				return
 			}
 
 			if calendar == "农历" {
@@ -3523,8 +3521,6 @@ func getEdbConvertDataMapList(chartInfoId, chartType int, calendar, startDate, e
 				item.IsNullData = true
 				edbList = append(edbList, item)
 				continue
-				err = errors.New(fmt.Sprint("获取最后实际数据的日期失败,Err:" + tmpErr.Error() + ";LatestDate:" + v.LatestDate))
-				return
 			}
 
 			if calendar == "农历" {
@@ -5264,8 +5260,6 @@ func getEdbDataMapListForSeason(chartInfoId, chartType int, calendar, startDate,
 				item.IsNullData = true
 				edbList = append(edbList, item)
 				continue
-				err = errors.New(fmt.Sprint("获取最后实际数据的日期失败,Err:" + tmpErr.Error() + ";LatestDate:" + v.LatestDate))
-				return
 			}
 
 			if calendar == "农历" {

+ 0 - 19
services/ppt/ppt_english_group.go

@@ -1218,25 +1218,6 @@ func GetEnglishGroupsByAdminId(adminId int) (ret ppt_english.RespGroupList, err
 	}
 
 	return
-	//则过滤空文件夹
-	//公共ppt
-	pubList := make([]*ppt_english.RespGroupListItem, 0)
-	for _, v := range ret.PublicList {
-		if len(v.PptList) > 0 {
-			pubList = append(pubList, v)
-		}
-	}
-	ret.PublicList = pubList
-
-	// 私有ppt
-	priList := make([]*ppt_english.RespGroupListItem, 0)
-	for _, v := range ret.PrivateList {
-		if len(v.PptList) > 0 {
-			priList = append(priList, v)
-		}
-	}
-	ret.PrivateList = priList
-	return
 }
 
 // ShareSingleGroupPptEnglishEnglish 共享单个ppt/取消共享单个ppt,返回共享状态

+ 1 - 1
services/sandbox/sandbox.go

@@ -474,7 +474,7 @@ func GetLastSandboxInfo(sandboxId int) (sandboxInfo *sandbox.Sandbox, err error)
 	//		CreateTime:          lastSandboxDraft.CreateTime,
 	//	}
 	//}
-	return
+	//return
 }
 
 // GenerateCode 生成沙盘code

+ 4 - 0
swagger/oauth2-redirect.html

@@ -1,5 +1,9 @@
 <!doctype html>
 <html lang="en-US">
+    <head>
+        <meta charset="UTF-8">
+        <title>Swagger UI</title>
+    </head>
 <body onload="run()">
 </body>
 </html>