Browse Source

fix:自定义分析表格,分类添加只看我的条件

Roc 1 year ago
parent
commit
b133a046e1

+ 2 - 2
controllers/data_manage/excel/custom_analysis.go

@@ -572,7 +572,7 @@ func FixTableData() {
 	// 修改时间序列表
 	{
 		// 获取时间序列表
-		timeTableExcelList, err := excelModel.GetNoContentExcelInfoAll(utils.TIME_TABLE)
+		timeTableExcelList, err := excelModel.GetNoContentExcelInfoAll(utils.TIME_TABLE, 0)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			fmt.Println("获取时间序列表列表失败,Err:" + err.Error())
 			return
@@ -590,7 +590,7 @@ func FixTableData() {
 	// 修改混合序列表
 	{
 		// 获取时间序列表
-		mixTableExcelList, err := excelModel.GetNoContentExcelInfoAll(utils.MIXED_TABLE)
+		mixTableExcelList, err := excelModel.GetNoContentExcelInfoAll(utils.MIXED_TABLE, 0)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			fmt.Println("获取时间序列表列表失败,Err:" + err.Error())
 			return

+ 8 - 1
controllers/data_manage/excel/excel_classify.go

@@ -22,6 +22,7 @@ type ExcelClassifyController struct {
 // @Title excel表格分类列表
 // @Description excel表格分类列表接口
 // @Param   Source   query   int  true       "格来源,1:excel插件的表格,2:自定义表格,3:混合表格,默认:1"
+// @Param   IsShowMe   query   bool  true       "是否只看我的,true、false"
 // @Success 200 {object} response.ExcelClassifyListResp
 // @router /excel_classify/list [get]
 func (this *ExcelClassifyController) List() {
@@ -35,6 +36,12 @@ func (this *ExcelClassifyController) List() {
 	if source <= 0 {
 		source = utils.EXCEL_DEFAULT
 	}
+	//只看我的
+	isShowMe, _ := this.GetBool("IsShowMe")
+	showUserId := 0
+	if isShowMe {
+		showUserId = this.SysUser.AdminId
+	}
 
 	// 获取一级分类
 	rootList, err := excel.GetExcelClassifyByParentId(0, source)
@@ -45,7 +52,7 @@ func (this *ExcelClassifyController) List() {
 	}
 
 	// 根据来源获取所有excel表格(无内容)
-	allExcelInfo, err := excel.GetNoContentExcelInfoAll(source)
+	allExcelInfo, err := excel.GetNoContentExcelInfoAll(source, showUserId)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取表格信息失败,Err:" + err.Error()

+ 8 - 3
models/data_manage/excel/excel_info.go

@@ -129,12 +129,17 @@ func GetExcelInfoAll() (items []*ExcelClassifyItems, err error) {
 }
 
 // GetNoContentExcelInfoAll 获取不含content的表格列表 用于分类展示
-func GetNoContentExcelInfoAll(source int) (items []*ExcelClassifyItems, err error) {
+func GetNoContentExcelInfoAll(source, userId int) (items []*ExcelClassifyItems, err error) {
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT excel_info_id,excel_classify_id,excel_name AS excel_classify_name,
              unique_code,sys_user_id,sys_user_real_name
-            FROM excel_info where is_delete=0  AND source = ?  ORDER BY sort asc,create_time desc `
-	_, err = o.Raw(sql, source).QueryRows(&items)
+            FROM excel_info where is_delete=0 AND source = ?  `
+
+	if userId > 0 {
+		sql += ` AND sys_user_id = ? `
+	}
+	sql += `  ORDER BY sort asc,create_time desc `
+	_, err = o.Raw(sql, source, userId).QueryRows(&items)
 	return
 }