Merge branch 'master' of http://8.136.199.33:3000/hongze/hz_crm_api into cygx_12.0

controllers/cygx/report_selection.go

@@ -9,6 +9,7 @@ import (
 	"hongze/hz_crm_api/models"
 	"hongze/hz_crm_api/models/cygx"
 	"hongze/hz_crm_api/models/system"
+	"hongze/hz_crm_api/services"
 	cygxService "hongze/hz_crm_api/services/cygx"
 	"hongze/hz_crm_api/utils"
 	"os"
@@ -325,13 +326,22 @@ func (this *ReportSelectionController) Detail() {
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
+
+	permissionNameMap, err := services.GetPermissionNameMap()
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败 GetPermissionNameMap，Err:" + err.Error()
+		return
+	}
 	mapChartLog := make(map[string]string)
 	for _, v := range listChartLog {
+		v.ChartPermissionName = permissionNameMap[v.ChartPermissionId]
 		mapChartLog[v.ChartPermissionName] = v.BodyChartSummary
 		permissionNameList = append(permissionNameList, cygx.CygxChartPermissionName{v.ChartPermissionName})
 	}
 	for _, v := range permissionNameList {
 		for _, v2 := range listMore {
+			v2.ChartPermissionName = permissionNameMap[v2.ChartPermissionId]
 			if v.ChartPermissionName == v2.ChartPermissionName {
 				item := new(cygx.CygxReportSelectionChart)
 				item.ChartPermissionName = v2.ChartPermissionName

models/chart_permission.go

@@ -145,3 +145,10 @@ func GetChartPermissionList() (list []*ChartPermission, err error) {
 	_, err = o.Raw(sql).QueryRows(&list)
 	return
 }
+
+func GetChartPermissionListRai() (items []*ChartPermission, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM chart_permission WHERE product_id=2  ORDER BY sort ASC `
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}

models/cygx/summary_manage.go

@@ -533,8 +533,7 @@ func GetArticleHistoryList(articleId int, condition string) (items []*ArticleHis
 				cygx_article_history_record_all AS h
 			WHERE
 				h.article_id = ?
-				AND h.platfor = 1
-				AND c.product_id = 2`
+				AND h.platfor = 1  AND h.is_del = 0  `
 	if condition != "" {
 		sql = sql + condition + ` GROUP BY h.id`
 	}

services/company_permission.go

@@ -333,3 +333,18 @@ func GetRaiSubObjPermissionIdMap() (permissionMap map[int]int, err error) {
 	}
 	return
 }
+
+// GetPermissionNameMap 权限名称与权限ID的map
+func GetPermissionNameMap() (mapItem map[int]string, err error) {
+	list, e := models.GetChartPermissionListRai()
+	if e != nil {
+		err = e
+		return
+	}
+	mapPermissionName := make(map[int]string)
+	for _, v := range list {
+		mapPermissionName[v.ChartPermissionId] = v.PermissionName
+	}
+	mapItem = mapPermissionName
+	return
+}