Merge branch 'wwq' into dev

pkg/service/cron/cron.go

@@ -259,6 +259,18 @@ func GetImportData(c *gin.Context) {
 		return
 	}
 	fmt.Println(res.UserList)
+	subNames := make(map[string]struct{}, len(res.UserList))
+	for _, v := range res.UserList {
+		subNames[v.SubNum] = struct{}{}
+	}
+	//检查subname是否正确是否存在
+	for _, v := range readExcelResult {
+		if _, ok := subNames[v.SubName]; !ok {
+			service.Error(c, errors.New(fmt.Sprintf("第 %d 行数据错误，请检查数据！", v.Line)))
+			return
+		}
+	}
+	//检查subname和name是否匹配
 	subNameFindExcelData := make(map[string]excelData, len(readExcelResult))
 	for _, v := range subNameFindExcelData {
 		subNameFindExcelData[v.SubName] = v
@@ -267,14 +279,11 @@ func GetImportData(c *gin.Context) {
 	result := make([]excelDataResult, len(readExcelResult))
 	for _, v := range res.UserList {
 		subNameFindID[v.SubNum] = v.Id
-		//名称不一致的报错
+
-		if data, exists := subNameFindExcelData[v.SubNum]; exists {
+		if subNameFindExcelData[v.SubNum].Name != v.Name && subNameFindExcelData[v.SubNum].Name != "" {
-			// 校验名称是否一致
+			fmt.Println(subNameFindExcelData[v.SubNum], v.Name)
-			if data.Name != v.Name {
+			service.Error(c, errors.New(fmt.Sprintf("第 %d 行数据错误，请检查数据！", subNameFindExcelData[v.SubNum].Line)))
-				fmt.Println(data.Name, v.Name)
+			return
-				service.Error(c, errors.New(fmt.Sprintf("第 %d 行数据错误，请检查数据！", data.Line)))
-				return // 直接返回，停止后续执行
-			}
 		}
 	}
 	for _, v := range readExcelResult {
@@ -283,8 +292,8 @@ func GetImportData(c *gin.Context) {
 			Name: v.Name,
 		})
 	}
-	service.Success(c, readExcelResult)
+	service.Success(c, result)
-
+	return
 }
 
 type excelData struct {