Merge branch 'ETA_2.4.0' into debug

controllers/data_manage/excel/excel_info.go

@@ -3417,7 +3417,7 @@ func (c *ExcelInfoController) SaveExcelReference() {
 		br.Ret = 408
 		return
 	}
-	var req []excel3.ExcelReferencesReq
+	var req excel3.ExcelReferencesReq
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &req)
 	if err != nil {
 		br.Msg = "参数解析异常！"
@@ -3426,41 +3426,41 @@ func (c *ExcelInfoController) SaveExcelReference() {
 	}
 
 	addList := make([]*excel3.ReferencedExcelConfig, 0)
-	for _, v := range req {
-		exist, e := excel3.GetReferencedExcelConfig(v.ReferencedId, v.FromScene, v.UniqueCode, v.Uuid)
-		if e != nil && e.Error() != utils.ErrNoRow() {
-			br.Msg = "查找引用失败"
-			br.ErrMsg = "查找引用失败，Err:" + e.Error()
-			return
-		}
-		if exist.ReferencedExcelConfigId == 0 {
-			item := excel3.ReferencedExcelConfig{
-				UniqueCode:   v.UniqueCode,
-				ReferencedId: v.ReferencedId,
-				FromScene:    v.FromScene,
-				Uuid:         v.Uuid,
-				WidthList:    v.WidthList,
-				HeightList:   v.HeightList,
-				OpUserId:     sysUser.AdminId,
-				OpUserName:   sysUser.RealName,
-				CreateTime:   time.Now(),
-				ModifyTime:   time.Now(),
-			}
-			addList = append(addList, &item)
-		} else {
-			exist.WidthList = v.WidthList
-			exist.HeightList = v.HeightList
-			exist.OpUserId = sysUser.AdminId
-			exist.OpUserName = sysUser.RealName
-			exist.ModifyTime = time.Now()
-			err = excel3.UpdateReferencedExcelConfig(&exist)
-			if err != nil {
-				br.Msg = "更新引用失败"
-				br.ErrMsg = "更新引用失败，Err:" + err.Error()
-				return
-			}
+
+	exist, e := excel3.GetReferencedExcelConfig(req.ReferencedId, req.FromScene, req.UniqueCode, req.Uuid)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		br.Msg = "查找引用失败"
+		br.ErrMsg = "查找引用失败，Err:" + e.Error()
+		return
+	}
+	if exist.ReferencedExcelConfigId == 0 {
+		item := excel3.ReferencedExcelConfig{
+			UniqueCode:   req.UniqueCode,
+			ReferencedId: req.ReferencedId,
+			FromScene:    req.FromScene,
+			Uuid:         req.Uuid,
+			WidthList:    req.WidthList,
+			HeightList:   req.HeightList,
+			OpUserId:     sysUser.AdminId,
+			OpUserName:   sysUser.RealName,
+			CreateTime:   time.Now(),
+			ModifyTime:   time.Now(),
+		}
+		addList = append(addList, &item)
+	} else {
+		exist.WidthList = req.WidthList
+		exist.HeightList = req.HeightList
+		exist.OpUserId = sysUser.AdminId
+		exist.OpUserName = sysUser.RealName
+		exist.ModifyTime = time.Now()
+		err = excel3.UpdateReferencedExcelConfig(&exist)
+		if err != nil {
+			br.Msg = "更新引用失败"
+			br.ErrMsg = "更新引用失败，Err:" + err.Error()
+			return
 		}
 	}
+
 	err = excel3.AddReferencedExcelConfig(addList)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "添加引用失败"