Merge branch 'feature/eta_1.9.8' into debug

controllers/data_manage/excel/custom_analysis.go

@@ -706,7 +706,7 @@ func (c *CustomAnalysisController) ClassifyList() {
 			}
 		}
 
-		sortUser := make([]int, 0)
+		sortUser := make([]int, 0) // 分享人目录排序
 		shareExists := make(map[int]bool)
 		for _, v := range excels {
 			item := new(excelModel.ExcelClassifyItems)
@@ -750,6 +750,10 @@ func (c *CustomAnalysisController) ClassifyList() {
 				sharedUserClassify[v.CreateUserId].Children = append(sharedUserClassify[v.CreateUserId].Children, item)
 			}
 		}
+		// 按照分享人第一次分享时间降序=_=!, 查询的时候是升序, 这里反过来
+		for i, j := 0, len(sortUser)-1; i < j; i, j = i+1, j-1 {
+			sortUser[i], sortUser[j] = sortUser[j], sortUser[i]
+		}
 		for _, v := range sortUser {
 			if sharedUserClassify[v] != nil {
 				sharedExcel.Children = append(sharedExcel.Children, sharedUserClassify[v])

controllers/data_manage/excel/excel_classify.go

@@ -392,11 +392,24 @@ func (this *ExcelClassifyController) AddExcelClassify() {
 	}
 
 	// 获取同级分类下存在同名分类的数量
-	count, err := excel.GetExcelClassifyCount(req.ExcelClassifyName, req.ParentId, source)
-	if err != nil {
-		br.Msg = "判断名称是否已存在失败"
-		br.ErrMsg = "判断名称是否已存在失败，Err:" + err.Error()
-		return
+	var count int
+	if source == utils.CUSTOM_ANALYSIS_TABLE {
+		// 自定义分析分类私有化了
+		ct, e := excel.GetCustomAnalysisExcelClassifyCount(req.ExcelClassifyName, req.ParentId, source, this.SysUser.AdminId)
+		if e != nil {
+			br.Msg = "操作失败"
+			br.ErrMsg = fmt.Sprintf("获取自定义分析同级分类下同名分类失败, %v", e)
+			return
+		}
+		count = ct
+	} else {
+		ct, e := excel.GetExcelClassifyCount(req.ExcelClassifyName, req.ParentId, source)
+		if e != nil {
+			br.Msg = "操作失败"
+			br.ErrMsg = fmt.Sprintf("获取同级分类下同名分类失败, %v", e)
+			return
+		}
+		count = ct
 	}
 	if count > 0 {
 		br.Msg = "分类名称已存在，请重新输入"

controllers/data_manage/excel/excel_info.go

@@ -130,6 +130,12 @@ func (c *ExcelInfoController) Add() {
 	condition += " AND excel_name=? "
 	pars = append(pars, req.ExcelName)
 
+	// 自定义分析私有化了
+	if req.Source == utils.CUSTOM_ANALYSIS_TABLE {
+		condition += ` AND sys_user_id = ? `
+		pars = append(pars, sysUser.AdminId)
+	}
+
 	// 获取分类下是否存在该表格名称
 	count, err := excel3.GetExcelInfoCountByCondition(condition, pars)
 	if err != nil {

models/data_manage/data_manage_permission/excel.go

@@ -993,7 +993,7 @@ func GetAdminAuthExcelInfoPermission(source, adminId int, keywords string) (item
 		sql += ` AND b.excel_name LIKE ?`
 		pars = append(pars, keywords)
 	}
-	sql += ` ORDER BY a.create_time DESC`
+	sql += ` ORDER BY a.create_time ASC`
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }

models/data_manage/excel/excel_classify.go

@@ -247,3 +247,10 @@ func GetExcelClassifyModelBySource(source int) (items []*ExcelClassify, err erro
 	_, err = o.Raw(sql, source).QueryRows(&items)
 	return
 }
+
+func GetCustomAnalysisExcelClassifyCount(classifyName string, parentId, source, adminId int) (count int, err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := `SELECT COUNT(1) AS count FROM excel_classify WHERE parent_id = ? AND source = ? AND excel_classify_name = ? AND is_delete = 0 AND sys_user_id = ?`
+	err = o.Raw(sql, parentId, source, classifyName).QueryRow(&count)
+	return
+}