Merge branch 'del_mark_status_0103'

controllers/data_manage/excel/excel_info.go

@@ -511,13 +511,18 @@ func (c *ExcelInfoController) Edit() {
 	}
 
 	// 标记编辑状态
-	_, err = services.UpdateExcelEditMark(req.ExcelInfoId, sysUser.AdminId, 1, sysUser.RealName)
+	markRet, err := services.UpdateExcelEditMark(req.ExcelInfoId, sysUser.AdminId, 1, sysUser.RealName)
 	if err != nil {
 		br.Msg = "查询标记状态失败"
 		br.ErrMsg = "查询标记状态失败，Err:" + err.Error()
 		return
 	}
-
+	if markRet.Status == 1 {
+		br.Ret = 200
+		br.Success = true
+		br.Data = markRet
+		return
+	}
 	excelClassify, err := excel3.GetExcelClassifyById(req.ExcelClassifyId)
 	if err != nil {
 		if err.Error() == utils.ErrNoRow() {
@@ -2276,8 +2281,13 @@ func (this *ExcelInfoController) MarkEditStatus() {
 		br.Msg = "标记状态异常"
 		return
 	}
+
+	status := 1
+	if req.Status == 2 {
+		status = 0
+	}
 	//更新标记key
-	data, err := services.UpdateExcelEditMark(req.ExcelInfoId, sysUser.AdminId, req.Status, sysUser.RealName)
+	data, err := services.UpdateExcelEditMark(req.ExcelInfoId, sysUser.AdminId, status, sysUser.RealName)
 	if err != nil {
 		br.Msg = err.Error()
 		return

services/excel_info.go

@@ -52,7 +52,7 @@ func UpdateExcelEditMark(excelInfoId, nowUserId, status int, nowUserName string)
 		if opUserId > 0 {
 			utils.Rc.Do("SETEX", key, int64(300), string(bt)) //3分钟缓存
 		} else {
-			utils.Rc.SetNX(key, string(bt), time.Second*60*5) //3分钟缓存
+			utils.Rc.SetNX(key, string(bt), time.Second*60*3) //3分钟缓存
 		}
 	} else if status == 0 {
 		//清除编辑缓存