Merge branch 'custom' of http://8.136.199.33:3000/eta_server/eta_api into bzq1/sci_hq_custom

controllers/data_manage/data_manage_permission/data_move.go

@@ -271,7 +271,7 @@ func (c *DataMangePermissionController) MoveEdbChartUser() {
 		return
 	}
 
-	err, errMsg := data_manage_permission.MoveEdbChart(req.Source, req.SubSource, req.UserId, req.NewUserId, req.IsSelectAll, req.DataIdList, req.NoDataIdList, req.Keyword, req.ClassifyId, sysUser.AdminId)
+	err, errMsg := data_manage_permission.MoveEdbChart(req.Source, req.SubSource, req.UserId, req.NewUserId, req.IsSelectAll, req.DataIdList, req.NoDataIdList, req.Keyword, req.Classify, sysUser.AdminId)
 	if err != nil {
 		//br.Success = true
 		br.Msg = "移动失败"

controllers/ppt_english.go

@@ -1066,8 +1066,8 @@ func (this *PptEnglishController) TitleCheck() {
 }
 
 // Editing
-// @Title 标记编辑状态
-// @Description 标记编辑状态
+// @Title 标记/查询编辑状态
+// @Description 标记/查询编辑状态
 // @Param	request	body models.PPTEditingReq true "type json string"
 // @Success 200 Ret=200 操作成功
 // @router /editing [post]
@@ -1098,7 +1098,7 @@ func (this *PptEnglishController) Editing() {
 		br.Msg = "参数有误"
 		return
 	}
-	if req.Status <= 0 {
+	if req.Status < 0 {
 		br.Msg = "标记状态异常"
 		return
 	}

controllers/ppt_english_group.go

@@ -4,7 +4,9 @@ import (
 	"encoding/json"
 	"eta/eta_api/models"
 	"eta/eta_api/models/ppt_english"
+	"eta/eta_api/services"
 	"eta/eta_api/services/ppt"
+	"fmt"
 	"strings"
 )
 
@@ -263,6 +265,13 @@ func (this *PptEnglishGroupController) GroupPptList() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
 	groupId, _ := this.GetInt("GroupId")
 
 	data, err := ppt.GetGroupPptEnglishList(int64(groupId), this.SysUser.AdminId)
@@ -271,6 +280,17 @@ func (this *PptEnglishGroupController) GroupPptList() {
 		br.IsSendEmail = false
 		return
 	}
+	// 编辑状态
+	for _, v := range data.List {
+		editor, e := services.UpdatePptEditing(int(v.PptId), 0, sysUser.AdminId, sysUser.RealName, true)
+		if e != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = fmt.Sprintf("获取PPT编辑状态失败, err: %s", e.Error())
+			return
+		}
+		v.Editor = editor
+	}
+
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "查询成功"
@@ -449,6 +469,13 @@ func (this *PptEnglishGroupController) SharePptList() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
 	adminId, _ := this.GetInt("AdminId")
 	keyword := this.GetString("Keyword")
 	isPrivate, _ := this.GetBool("IsPrivate", false)
@@ -462,6 +489,17 @@ func (this *PptEnglishGroupController) SharePptList() {
 		br.Msg = err.Error()
 		return
 	}
+	// 编辑状态
+	for _, v := range data.List {
+		editor, e := services.UpdatePptEditing(int(v.PptId), 0, sysUser.AdminId, sysUser.RealName, true)
+		if e != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = fmt.Sprintf("获取PPT编辑状态失败, err: %s", e.Error())
+			return
+		}
+		v.Editor = editor
+	}
+
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "查询成功"
@@ -482,6 +520,13 @@ func (this *PptEnglishGroupController) GrantPptList() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
 	groupId, _ := this.GetInt("GroupId")
 	keyword := this.GetString("Keyword")
 
@@ -501,6 +546,17 @@ func (this *PptEnglishGroupController) GrantPptList() {
 		br.Msg = err.Error()
 		return
 	}
+	// 编辑状态
+	for _, v := range data.List {
+		editor, e := services.UpdatePptEditing(int(v.PptId), 0, sysUser.AdminId, sysUser.RealName, true)
+		if e != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = fmt.Sprintf("获取PPT编辑状态失败, err: %s", e.Error())
+			return
+		}
+		v.Editor = editor
+	}
+
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "查询成功"

controllers/ppt_v2.go

@@ -1238,8 +1238,8 @@ func (this *PptV2Controller) TitleCheck() {
 }
 
 // Editing
-// @Title 标记编辑状态
-// @Description 标记编辑状态
+// @Title 标记/查询编辑状态
+// @Description 标记/查询编辑状态
 // @Param	request	body models.PPTEditingReq true "type json string"
 // @Success 200 Ret=200 操作成功
 // @router /editing [post]
@@ -1270,7 +1270,7 @@ func (this *PptV2Controller) Editing() {
 		br.Msg = "参数有误"
 		return
 	}
-	if req.Status <= 0 {
+	if req.Status < 0 {
 		br.Msg = "标记状态异常"
 		return
 	}

controllers/ppt_v2_group.go

@@ -3,7 +3,9 @@ package controllers
 import (
 	"encoding/json"
 	"eta/eta_api/models"
+	"eta/eta_api/services"
 	"eta/eta_api/services/ppt"
+	"fmt"
 	"strings"
 )
 
@@ -265,6 +267,13 @@ func (this *PptV2GroupController) GroupPptList() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
 	groupId, _ := this.GetInt("GroupId")
 
 	data, err := ppt.GetGroupPptList(int64(groupId), this.SysUser.AdminId)
@@ -273,6 +282,18 @@ func (this *PptV2GroupController) GroupPptList() {
 		br.IsSendEmail = false
 		return
 	}
+
+	// 编辑状态
+	for _, v := range data.List {
+		editor, e := services.UpdatePptEditing(int(v.PptId), 0, sysUser.AdminId, sysUser.RealName, false)
+		if e != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = fmt.Sprintf("获取PPT编辑状态失败, err: %s", e.Error())
+			return
+		}
+		v.Editor = editor
+	}
+
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "查询成功"
@@ -451,6 +472,13 @@ func (this *PptV2GroupController) SharePptList() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
 	adminId, _ := this.GetInt("AdminId")
 	keyword := this.GetString("Keyword")
 	isPrivate, _ := this.GetBool("IsPrivate", false)
@@ -464,6 +492,17 @@ func (this *PptV2GroupController) SharePptList() {
 		br.Msg = err.Error()
 		return
 	}
+	// 编辑状态
+	for _, v := range data.List {
+		editor, e := services.UpdatePptEditing(int(v.PptId), 0, sysUser.AdminId, sysUser.RealName, false)
+		if e != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = fmt.Sprintf("获取PPT编辑状态失败, err: %s", e.Error())
+			return
+		}
+		v.Editor = editor
+	}
+
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "查询成功"
@@ -484,6 +523,13 @@ func (this *PptV2GroupController) GrantPptList() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
 	groupId, _ := this.GetInt("GroupId")
 	keyword := this.GetString("Keyword")
 
@@ -503,6 +549,17 @@ func (this *PptV2GroupController) GrantPptList() {
 		br.Msg = err.Error()
 		return
 	}
+	// 编辑状态
+	for _, v := range data.List {
+		editor, e := services.UpdatePptEditing(int(v.PptId), 0, sysUser.AdminId, sysUser.RealName, false)
+		if e != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = fmt.Sprintf("获取PPT编辑状态失败, err: %s", e.Error())
+			return
+		}
+		v.Editor = editor
+	}
+
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "查询成功"

models/data_manage/data_manage_permission/req_and_resp.go

@@ -10,7 +10,7 @@ type MoveEdbChartReq struct {
 	NoDataIdList []string `description:"指标/图表唯一id列表"`
 	NewUserId    int      `description:"新的创建人id"`
 	IsSelectAll  bool     `description:"是否选择所有指标"`
-	ClassifyId   string   `description:"分类id，支持多选，用英文,隔开"`
+	Classify     string   `description:"分类id，支持多选，用英文,隔开"`
 	Keyword      string   `description:"关键字"`
 	UserId       int      `description:"旧的创建人id"`
 }

models/data_manage/edb_data_sci99.go

@@ -12,13 +12,13 @@ type Sci99Data struct {
 
 func GetEdbDataSci99MaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT MIN(data_time) AS minDate,MAX(data_time) AS maxDate FROM edb_data_icpi WHERE edb_code=? `
+	sql := ` SELECT MIN(data_time) AS minDate,MAX(data_time) AS maxDate FROM edb_data_sci99 WHERE edb_code=? `
 	err = o.Raw(sql, edbCode).QueryRow(&minDate, &maxDate)
 	return
 }
 
 type BaseFromSci99IndexItem struct {
-	BaseFromSciIndexId int    `orm:"column(base_from_sci_index_id);pk"` // 主键，自动递增
+	BaseFromSciIndexId int    `orm:"column(base_from_sci99_index_id);pk"` // 主键，自动递增
 	IndexCode          string // 指标编码
 	IndexName          string // 指标名称
 	ClassifyId         int    // 分类Id

models/ppt_english/ppt_english_group.go

@@ -216,22 +216,23 @@ type RespGroupPptNameListItem struct {
 }
 
 type RespGroupPptListItem struct {
-	GroupPptId    int64  `description:"目录和ppt绑定序号"`
-	PptId         int64  `description:"ppt ID"`
-	TemplateType  int    `description:"模版类型"`
-	BackgroundImg string `description:"背景图片"`
-	Title         string `description:"标题"`
-	PptCreateTime string `description:"ppt创建时间"`
-	PptModifyTime string `description:"ppt修改时间"`
-	AdminId       int    `description:"移动ppt到该目录的系统用户id"`
-	AdminRealName string `description:"系统用户名称"`
-	PptVersion    int8   `description:"是否ppt的旧版本；1：旧的，2：新的"`
-	IsSingleShare int8   `description:"是否是单个共享ppt，0未单个共享，1共享"`
-	PptxUrl       string `description:"pptx下载地址"`
-	PptPage       int    `description:"PPT总页数"`
-	ReportId      int    `description:"关联的报告ID"`
-	ReportCode    string `description:"关联的报告code"`
-	PublishTime   string `description:"发布时间"`
+	GroupPptId    int64           `description:"目录和ppt绑定序号"`
+	PptId         int64           `description:"ppt ID"`
+	TemplateType  int             `description:"模版类型"`
+	BackgroundImg string          `description:"背景图片"`
+	Title         string          `description:"标题"`
+	PptCreateTime string          `description:"ppt创建时间"`
+	PptModifyTime string          `description:"ppt修改时间"`
+	AdminId       int             `description:"移动ppt到该目录的系统用户id"`
+	AdminRealName string          `description:"系统用户名称"`
+	PptVersion    int8            `description:"是否ppt的旧版本；1：旧的，2：新的"`
+	IsSingleShare int8            `description:"是否是单个共享ppt，0未单个共享，1共享"`
+	PptxUrl       string          `description:"pptx下载地址"`
+	PptPage       int             `description:"PPT总页数"`
+	ReportId      int             `description:"关联的报告ID"`
+	ReportCode    string          `description:"关联的报告code"`
+	PublishTime   string          `description:"发布时间"`
+	Editor        PPTEditingCache `description:"编辑人信息"`
 }
 
 func (p RespGroupPptList) Len() int {

models/ppt_v2_group.go

@@ -1,6 +1,7 @@
 package models
 
 import (
+	"eta/eta_api/models/ppt_english"
 	"time"
 
 	"github.com/beego/beego/v2/client/orm"
@@ -216,22 +217,23 @@ type RespGroupPptNameListItem struct {
 }
 
 type RespGroupPptListItem struct {
-	GroupPptId    int64  `description:"目录和ppt绑定序号"`
-	PptId         int64  `description:"ppt ID"`
-	TemplateType  int    `description:"模版类型"`
-	BackgroundImg string `description:"背景图片"`
-	Title         string `description:"标题"`
-	PptCreateTime string `description:"ppt创建时间"`
-	PptModifyTime string `description:"ppt修改时间"`
-	AdminId       int    `description:"移动ppt到该目录的系统用户id"`
-	AdminRealName string `description:"系统用户名称"`
-	PptVersion    int8   `description:"是否ppt的旧版本；1：旧的，2：新的"`
-	IsSingleShare int8   `description:"是否是单个共享ppt，0未单个共享，1共享"`
-	PptxUrl       string `description:"pptx下载地址"`
-	PptPage       int    `description:"PPT总页数"`
-	ReportId      int    `description:"关联的报告ID"`
-	ReportCode    string `description:"关联的报告code"`
-	PublishTime   string `description:"发布时间"`
+	GroupPptId    int64                       `description:"目录和ppt绑定序号"`
+	PptId         int64                       `description:"ppt ID"`
+	TemplateType  int                         `description:"模版类型"`
+	BackgroundImg string                      `description:"背景图片"`
+	Title         string                      `description:"标题"`
+	PptCreateTime string                      `description:"ppt创建时间"`
+	PptModifyTime string                      `description:"ppt修改时间"`
+	AdminId       int                         `description:"移动ppt到该目录的系统用户id"`
+	AdminRealName string                      `description:"系统用户名称"`
+	PptVersion    int8                        `description:"是否ppt的旧版本；1：旧的，2：新的"`
+	IsSingleShare int8                        `description:"是否是单个共享ppt，0未单个共享，1共享"`
+	PptxUrl       string                      `description:"pptx下载地址"`
+	PptPage       int                         `description:"PPT总页数"`
+	ReportId      int                         `description:"关联的报告ID"`
+	ReportCode    string                      `description:"关联的报告code"`
+	PublishTime   string                      `description:"发布时间"`
+	Editor        ppt_english.PPTEditingCache `description:"编辑人信息"`
 }
 
 func (p RespGroupPptList) Len() int {

services/data/excel/balance_table.go

@@ -119,8 +119,9 @@ func GetBalanceExcelEdbData(excelEdbMappingItem *excelModel.ExcelChartEdb, newMi
 	var dateList, dataList []string
 	// 日期序列
 	{
-		_, startColumnName, endColumnName, startNum, endNum, isAll, isRow, isColumn, tmpErr := GetSheetStr(excelEdbMappingItem.DateSequence)
+		_, startColumnName, endColumnName, startNum, endNum, isAll, isRow, isColumn, tmpErr, tmpErrMsg := GetSheetStr(excelEdbMappingItem.DateSequence)
 		if tmpErr != nil {
+			errMsg = tmpErrMsg
 			err = tmpErr
 			return
 		}
@@ -218,8 +219,9 @@ func GetBalanceExcelEdbData(excelEdbMappingItem *excelModel.ExcelChartEdb, newMi
 
 	// 数据序列
 	{
-		_, startColumnName, endColumnName, startNum, endNum, isAll, isRow, isColumn, tmpErr := GetSheetStr(excelEdbMappingItem.DataSequence)
+		_, startColumnName, endColumnName, startNum, endNum, isAll, isRow, isColumn, tmpErr, tmpErrMsg := GetSheetStr(excelEdbMappingItem.DataSequence)
 		if tmpErr != nil {
+			errMsg = tmpErrMsg
 			err = tmpErr
 			return
 		}

services/data/excel/custom_analysis_edb.go

@@ -265,8 +265,18 @@ func Refresh(excelInfo *excel.ExcelInfo, lang string) (err error, errMsg string,
 		// 获取对应的日期和数据列表
 		relDateList, relDataList, tmpErr, tmpErrMsg := getDateAndDataList(v, xlsxFile)
 		if tmpErr != nil {
-			err = errors.New(fmt.Sprintf("获取对应的日期和数据列表，Err：%s", tmpErr.Error()))
-			errMsg = tmpErrMsg
+			err = errors.New(fmt.Sprintf("《%s》获取对应的日期和数据列表，Err：%s", v.EdbName, tmpErr.Error()))
+			errMsg = fmt.Sprintf("《%s》%s", v.EdbName, tmpErrMsg)
+			return
+		}
+		if len(relDateList) <= 0 {
+			errMsg = fmt.Sprintf("《%s》的日期序列为空", v.EdbName)
+			err = errors.New(errMsg)
+			return
+		}
+		if len(relDataList) <= 0 {
+			errMsg = fmt.Sprintf("《%s》的数据序列为空", v.EdbName)
+			err = errors.New(errMsg)
 			return
 		}
 		//fmt.Println(v)
@@ -318,8 +328,9 @@ func getDateAndDataList(excelEdbMappingItem *excel.ExcelEdbMappingItem, xlsxFile
 
 	// 日期序列
 	{
-		sheetName, startColumnName, endColumnName, startNum, endNum, isAll, isRow, isColumn, tmpErr := GetSheetStr(excelEdbMappingItem.DateSequenceStr)
+		sheetName, startColumnName, endColumnName, startNum, endNum, isAll, isRow, isColumn, tmpErr, tmpErrMsg := GetSheetStr(excelEdbMappingItem.DateSequenceStr)
 		if tmpErr != nil {
+			errMsg = tmpErrMsg
 			err = tmpErr
 			return
 		}
@@ -423,8 +434,9 @@ func getDateAndDataList(excelEdbMappingItem *excel.ExcelEdbMappingItem, xlsxFile
 
 	// 数据序列
 	{
-		sheetName, startColumnName, endColumnName, startNum, endNum, isAll, isRow, isColumn, tmpErr := GetSheetStr(excelEdbMappingItem.DataSequenceStr)
+		sheetName, startColumnName, endColumnName, startNum, endNum, isAll, isRow, isColumn, tmpErr, tmpErrMsg := GetSheetStr(excelEdbMappingItem.DataSequenceStr)
 		if tmpErr != nil {
+			errMsg = tmpErrMsg
 			err = tmpErr
 			return
 		}
@@ -541,11 +553,14 @@ func getDateAndDataList(excelEdbMappingItem *excel.ExcelEdbMappingItem, xlsxFile
 // @return isAll bool 是否选择整行/列数据
 // @return isRow bool 是否选择行数据
 // @return isColumn bool 是否选择列数据
-func GetSheetStr(sequenceStr string) (sheetName, startColumnName, endColumnName string, startNum, endNum int, isAll, isRow, isColumn bool, err error) {
+// @return err error 错误信息
+// @return errMsg string 错误信息
+func GetSheetStr(sequenceStr string) (sheetName, startColumnName, endColumnName string, startNum, endNum int, isAll, isRow, isColumn bool, err error, errMsg string) {
 	// 找出sheetName
 	tmpList := strings.Split(sequenceStr, "!")
 	if len(tmpList) != 2 {
-		err = errors.New("错误的公式，查找sheet异常：" + sequenceStr)
+		errMsg = "错误的公式，查找sheet异常：" + sequenceStr
+		err = errors.New(errMsg)
 		return
 	}
 
@@ -554,7 +569,8 @@ func GetSheetStr(sequenceStr string) (sheetName, startColumnName, endColumnName
 	// 分离开始/结束单元格
 	tmpList = strings.Split(tmpList[1], ":")
 	if len(tmpList) != 2 {
-		err = errors.New("错误的公式，查找开始/结束单元格异常：" + sequenceStr)
+		errMsg = "错误的公式，查找开始/结束单元格异常：" + sequenceStr
+		err = errors.New(errMsg)
 		return
 	}
 
@@ -563,12 +579,14 @@ func GetSheetStr(sequenceStr string) (sheetName, startColumnName, endColumnName
 
 	lenList := len(startList)
 	if lenList != len(endList) {
-		err = errors.New("错误的公式，开始与结束单元格异常：" + sequenceStr)
+		errMsg = "错误的公式，开始与结束单元格异常：" + sequenceStr
+		err = errors.New(errMsg)
 		return
 	}
 
 	if lenList != 3 && lenList != 2 {
-		err = errors.New("错误的公式：" + sequenceStr)
+		errMsg = "错误的公式：" + sequenceStr
+		err = errors.New(errMsg)
 		return
 	}
 
@@ -606,7 +624,7 @@ func GetSheetStr(sequenceStr string) (sheetName, startColumnName, endColumnName
 	// 确定行
 	startDeci, tmpErr1 := decimal.NewFromString(startList[2])
 	endDeci, tmpErr2 := decimal.NewFromString(endList[2])
-	if tmpErr1 != nil && tmpErr1 != tmpErr2 {
+	if tmpErr1 != nil && errors.Is(tmpErr1, tmpErr2) {
 		err = errors.New("错误的公式3：" + sequenceStr)
 		return
 	}
@@ -615,7 +633,8 @@ func GetSheetStr(sequenceStr string) (sheetName, startColumnName, endColumnName
 	endNum = int(endDeci.IntPart())
 
 	if startColumnName != endColumnName && startNum != endNum {
-		err = errors.New("选区不允许跨行或者跨列")
+		errMsg = `选区不允许跨行或者跨列`
+		err = errors.New(errMsg)
 	}
 
 	if startColumnName == endColumnName {

services/data/excel/excel_classify.go

@@ -2,7 +2,6 @@ package excel
 
 import (
 	"errors"
-	"eta/eta_api/models/data_manage"
 	"eta/eta_api/models/data_manage/excel"
 	"eta/eta_api/models/data_manage/excel/request"
 	"eta/eta_api/utils"
@@ -249,7 +248,7 @@ func moveExcelClassify(parentExcelClassifyInfo, excelClassifyInfo, prevClassify,
 			updateCol = append(updateCol, "Sort", "ModifyTime")
 		} else {
 			// 拖动到父级分类的第一位
-			firstClassify, tmpErr := data_manage.GetFirstEdbClassifyByParentId(parentClassifyId)
+			firstClassify, tmpErr := excel.GetFirstExcelClassifyByParentId(parentClassifyId)
 			if tmpErr != nil && tmpErr.Error() != utils.ErrNoRow() {
 				errMsg = "移动失败"
 				err = errors.New("获取获取当前父级分类下的排序第一条的分类信息失败,Err:" + tmpErr.Error())
@@ -259,7 +258,7 @@ func moveExcelClassify(parentExcelClassifyInfo, excelClassifyInfo, prevClassify,
 			//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
 			if firstClassify != nil && firstClassify.Sort == 0 {
 				updateSortStr := ` sort + 1 `
-				_ = excel.UpdateExcelClassifySortByParentId(parentClassifyId, firstClassify.ClassifyId-1, 0, updateSortStr, source)
+				_ = excel.UpdateExcelClassifySortByParentId(parentClassifyId, firstClassify.ExcelClassifyId-1, 0, updateSortStr, source)
 				//该分类下的所有表格也需要+1
 				_ = excel.UpdateExcelInfoSortByClassifyId(parentClassifyId, 0, 0, updateSortStr, source)
 			} else {