Merge branch 'debug' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/help_doc/classify.go

@@ -44,15 +44,33 @@ func (this *HelpDocClassifyController) ListClassify() {
 		br.ErrMsg = "获取数据失败，Err:" + err.Error()
 		return
 	}
-
+	rootListAll := make([]help_doc.HelpDocClassifyItems, 0)
+	rootListAll = rootList
 	nodeAll := make([]*help_doc.HelpDocClassifyItems, 0)
-	for k := range rootList {
-		rootNode := rootList[k]
-		data.HelpDocClassifyItemsMakeTree(classifyAll, rootNode)
-		nodeAll = append(nodeAll, rootNode)
+	for k := range rootListAll {
+		rootNode := rootListAll[k]
+		data.HelpDocClassifyItemsMakeTree(classifyAll, &rootNode)
+		nodeAll = append(nodeAll, &rootNode)
+	}
+
+	//添加分类用，只有一二级目录
+	classifyLevel, err := help_doc.GetHelpDocClassifyLevel()
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取数据失败，Err:" + err.Error()
+		return
+	}
+	rootListLevel := make([]help_doc.HelpDocClassifyItems, 0)
+	rootListLevel = rootList
+	nodeAllTwoLevel := make([]*help_doc.HelpDocClassifyItems, 0)
+	for k := range rootListLevel {
+		rootNode := rootListLevel[k]
+		data.HelpDocClassifyItemsMakeTree(classifyLevel, &rootNode)
+		nodeAllTwoLevel = append(nodeAllTwoLevel, &rootNode)
 	}
 
 	resp.AllNodes = nodeAll
+	resp.TwoLevelNodes = nodeAllTwoLevel
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"
@@ -178,22 +196,12 @@ func (this *HelpDocClassifyController) EditClassify() {
 			return
 		}
 
-		err = help_doc.EditHelpDocClassify(req.HelpDocClassifyId,req.ParentId, req.HelpDocClassifyName)
+		err = help_doc.EditHelpDocClassify(req.HelpDocClassifyId, req.HelpDocClassifyName)
 		if err != nil {
 			br.Msg = "保存失败"
 			br.ErrMsg = "保存失败,Err:" + err.Error()
 			return
 		}
-
-		// 修改文档中的分类名
-		if req.HelpDocClassifyName != item.ClassifyName {
-			err = help_doc.EditHelpDocClassifyId(req.HelpDocClassifyId, req.HelpDocClassifyName)
-			if err != nil {
-				br.Msg = "保存失败"
-				br.ErrMsg = "保存失败,Err:" + err.Error()
-				return
-			}
-		}
 	}
 	br.Ret = 200
 	br.Msg = "保存成功"
@@ -396,4 +404,52 @@ func (this *HelpDocClassifyController) ClassifyMove() {
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "移动成功"
-}
+}
+
+// @Title 编辑分类可见权限
+// @Description 编辑分类可见权限接口
+// @Param   ClassifyId   int  true       "分类Id"
+// @Param   ClassifyName   string  true       "分类名称"
+// @Param   ParentId   query   int  true       "父级Id 添加父级时为0"
+// @Param   Sort   query   string  false       "排序"
+// @Success 200 保存成功
+// @router /classify/visible/edit [post]
+func (this *HelpDocClassifyController) EditClassifyVisible() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	var req help_doc.EditHelpDocClassifyVisibleReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+
+	if req.HelpDocClassifyId <= 0 {
+		br.Msg = "参数错误"
+		br.IsSendEmail = false
+		return
+	}
+
+	//item, err := help_doc.GetHelpDocClassifyById(req.HelpDocClassifyId)
+	//if err != nil {
+	//	br.Msg = "保存失败"
+	//	br.Msg = "获取分类信息失败,Err:" + err.Error()
+	//	return
+	//}
+
+	err = help_doc.EditHelpDocClassifyVisible(req.HelpDocClassifyId, req.VisibleBusinessIds)
+	if err != nil {
+		br.Msg = "保存失败"
+		br.ErrMsg = "保存失败,Err:" + err.Error()
+		return
+	}
+
+	br.Ret = 200
+	br.Msg = "保存成功"
+	br.Success = true
+	br.IsAddLog = true
+}

controllers/help_doc/doc.go

@@ -2,6 +2,7 @@ package help_doc
 
 import (
 	"encoding/json"
+	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"hongze/hz_crm_api/controllers"
 	"hongze/hz_crm_api/models"
@@ -9,6 +10,7 @@ import (
 	"hongze/hz_crm_api/utils"
 	"html"
 	"strconv"
+	"strings"
 	"time"
 )
 
@@ -42,6 +44,7 @@ func (this *HelpDocController) Add() {
 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
 		return
 	}
+	fmt.Println("Id:",req.Id)
 	if req.Content == "" {
 		br.Msg = "请输入内容"
 		return
@@ -81,7 +84,7 @@ func (this *HelpDocController) Add() {
 		item.PublishTime = time.Now()
 	}
 
-	if item.Id == 0 {
+	if req.Id == 0 {
 		_, err = help_doc.AddHelpDoc(item)
 		if err != nil {
 			br.Msg = "新增失败"
@@ -89,7 +92,7 @@ func (this *HelpDocController) Add() {
 			return
 		}
 	} else {
-		err = help_doc.EditHelpDoc(item, int64(item.Id))
+		err = help_doc.EditHelpDoc(item, req.Id)
 		if err != nil {
 			br.Msg = "保存失败"
 			br.ErrMsg = "保存失败,Err:" + err.Error()
@@ -150,7 +153,7 @@ func (this *HelpDocController) Detail() {
 
 	var recommend []help_doc.RecommendList
 	if item.Recommend != "" {
-		err = json.Unmarshal([]byte(item.Recommend), &anchor)
+		err = json.Unmarshal([]byte(item.Recommend), &recommend)
 		if err != nil {
 			br.Msg = "解析失败"
 			br.ErrMsg = "解析失败，Err:" + err.Error()
@@ -204,7 +207,7 @@ func (this *HelpDocController) ListReport() {
 	pageSize, _ := this.GetInt("PageSize")
 	currentIndex, _ := this.GetInt("CurrentIndex")
 
-	classifyId := this.GetString("ClassifyId")
+	classifyIds := this.GetString("ClassifyIds")
 	keyWord := this.GetString("KeyWord")
 
 	var startSize int
@@ -223,9 +226,10 @@ func (this *HelpDocController) ListReport() {
 		condition += ` AND title LIKE '%` + keyWord + `%' `
 	}
 
-	if classifyId != "" {
-		condition += ` AND classify_id= ? `
-		pars = append(pars, classifyId)
+	if len(classifyIds) > 0 {
+		classifyIdSlice := strings.Split(classifyIds,",")
+		condition += ` AND classify_id IN ( ` + utils.GetOrmInReplace(len(classifyIdSlice)) + ` ) `
+		pars = append(pars, classifyIdSlice)
 	}
 
 	total, err := help_doc.GetHelpDocListCount(condition, pars)
@@ -240,6 +244,7 @@ func (this *HelpDocController) ListReport() {
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
+
 	resp := new(help_doc.HelpDocListResp)
 	for _, item := range list {
 		var anchor []help_doc.AnchorList
@@ -254,7 +259,7 @@ func (this *HelpDocController) ListReport() {
 
 		var recommend []help_doc.RecommendList
 		if item.Recommend != "" {
-			err = json.Unmarshal([]byte(item.Recommend), &anchor)
+			err = json.Unmarshal([]byte(item.Recommend), &recommend)
 			if err != nil {
 				br.Msg = "解析失败"
 				br.ErrMsg = "解析失败，Err:" + err.Error()

models/help_doc/classify.go

@@ -40,7 +40,6 @@ func GetHelpDocClassifyCount(HelpDocClassifyName string, parentId int) (count in
 type EditHelpDocClassifyReq struct {
 	HelpDocClassifyName string `description:"分类名称"`
 	HelpDocClassifyId   int    `description:"分类id"`
-	ParentId            int    `description:"父级id"`
 }
 
 func GetHelpDocClassifyById(classifyId int) (item *HelpDocClassify, err error) {
@@ -57,36 +56,18 @@ func GetHelpDocClassifyCountById(classifyId int) (count int, err error) {
 	return
 }
 
-func EditHelpDocClassify(classifyId, parentId int, HelpDocClassifyName string) (err error) {
-	o := orm.NewOrm()
-	sql := `UPDATE help_doc_classify SET classify_name=?,parent_id = ?, modify_time=NOW() WHERE classify_id=? `
-	_, err = o.Raw(sql, HelpDocClassifyName, parentId, classifyId).Exec()
-	return
-}
-
-func GetChartInfoCountByClassifyId(classifyId int) (count int, err error) {
+func EditHelpDocClassify(classifyId int, HelpDocClassifyName string) (err error) {
 	o := orm.NewOrm()
-	sql := ` SELECT COUNT(1) AS count FROM chart_info AS a
-				WHERE a.classify_id IN(
-				SELECT t.classify_id FROM 
-				(
-				SELECT rd.*
-				FROM (SELECT * FROM help_doc_classify WHERE parent_id IS NOT NULL) rd,
-					 (SELECT @pid := ?) pd 
-				WHERE FIND_IN_SET(parent_id, @pid) > 0 
-				  AND @pid := CONCAT(@pid, ',', classify_id) 
-				UNION SELECT * FROM help_doc_classify WHERE classify_id = @pid
-				)AS t
-				) `
-	err = o.Raw(sql, classifyId).QueryRow(&count)
+	sql := `UPDATE help_doc_classify SET classify_name=?, modify_time=NOW() WHERE classify_id=? `
+	_, err = o.Raw(sql, HelpDocClassifyName, classifyId).Exec()
 	return
 }
 
 // GetHelpDocClassifyByParentId
-func GetHelpDocClassifyByParentId(parentId int, keyWord string) (items []*HelpDocClassifyItems, err error) {
+func GetHelpDocClassifyByParentId(parentId int, keyWord string) (items []HelpDocClassifyItems, err error) {
 	o := orm.NewOrm()
 	sql := ``
-	if keyWord != ""{
+	if keyWord != "" {
 		sql = ` SELECT * FROM help_doc_classify WHERE parent_id=? AND (classify_name LIKE '%` + keyWord + `%' ) order by sort asc,classify_id asc`
 	} else {
 		sql = ` SELECT * FROM help_doc_classify WHERE parent_id=? order by sort asc,classify_id asc`
@@ -99,7 +80,7 @@ func GetHelpDocClassifyByParentId(parentId int, keyWord string) (items []*HelpDo
 func GetHelpDocClassifyAll(keyWord string) (items []*HelpDocClassifyItems, err error) {
 	o := orm.NewOrm()
 	sql := ``
-	if keyWord != ""{
+	if keyWord != "" {
 		sql = ` SELECT * FROM help_doc_classify WHERE parent_id<>0 AND (classify_name LIKE '%` + keyWord + `%' ) order by sort asc,classify_id asc`
 	} else {
 		sql = ` SELECT * FROM help_doc_classify WHERE parent_id<>0 order by sort asc,classify_id asc`
@@ -109,19 +90,21 @@ func GetHelpDocClassifyAll(keyWord string) (items []*HelpDocClassifyItems, err e
 }
 
 type HelpDocClassifyItems struct {
-	ClassifyId     int `description:"分类id"`
-	ClassifyName   string
-	ParentId              int
-	Level                 int    `description:"层级"`
-	Sort                  int    `description:"排序字段，越小越靠前，默认值：10"`
-	SourceName            string `description:"来源名称"`
-	SysUserId             int    `description:"创建人id"`
-	SysUserRealName       string `description:"创建人姓名"`
-	Children              []*HelpDocClassifyItems
+	ClassifyId         int `description:"分类id"`
+	ClassifyName       string
+	ParentId           int
+	Level              int    `description:"层级"`
+	Sort               int    `description:"排序字段，越小越靠前，默认值：10"`
+	SourceName         string `description:"来源名称"`
+	SysUserId          int    `description:"创建人id"`
+	SysUserRealName    string `description:"创建人姓名"`
+	VisibleBusinessIds string
+	Children           []*HelpDocClassifyItems
 }
 
 type HelpDocClassifyListResp struct {
-	AllNodes []*HelpDocClassifyItems
+	AllNodes      []*HelpDocClassifyItems
+	TwoLevelNodes []*HelpDocClassifyItems
 }
 
 type HelpDocClassifyDeleteCheckResp struct {
@@ -192,41 +175,6 @@ type HelpDocClassifyView struct {
 	ParentId            int    `description:"父级id"`
 }
 
-func GetHelpDocClassifyViewById(classifyId int) (item *HelpDocClassifyView, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM help_doc_classify WHERE classify_id=? `
-	err = o.Raw(sql, classifyId).QueryRow(&item)
-	return
-}
-
-func GetHelpDocClassifyByParentIdFromETA(parentId int) (items []*HelpDocClassifyItems, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT * FROM help_doc_classify WHERE parent_id=? AND source = 1 order by sort asc,classify_id asc`
-	_, err = o.Raw(sql, parentId).QueryRows(&items)
-	return
-}
-
-func GetHelpDocClassifyAllFromETA() (items []*HelpDocClassifyItems, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT * FROM help_doc_classify WHERE parent_id<>0 AND source = 1 order by sort asc,classify_id asc`
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
-func GetHelpDocClassifyTwo(source int) (items []*HelpDocClassifyItems, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT * FROM help_doc_classify WHERE level=3 AND source = ? order by sort asc,classify_id asc`
-	_, err = o.Raw(sql, source).QueryRows(&items)
-	return
-}
-
-func GetHelpDocClassifyByLevel(level, source int) (items []*HelpDocClassifyItems, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT * FROM help_doc_classify WHERE level=? AND source = ? order by sort asc,classify_id asc`
-	_, err = o.Raw(sql, level, source).QueryRows(&items)
-	return
-}
-
 func EditHelpDocClassifySysUser(classifyId, sysUserId int, HelpDocClassifyName string) (err error) {
 	o := orm.NewOrm()
 	sql := `UPDATE help_doc_classify SET sys_user_id=?,sys_user_real_name=?,modify_time=NOW() WHERE parent_id=?  AND level=3 `
@@ -256,11 +204,31 @@ func DeleteHelpDocClassify(classifyId int) (err error) {
 	return
 }
 
-
 // MoveClassifyReq 移动分类请求参数
 type MoveClassifyReq struct {
 	ClassifyId       int `description:"分类id"`
 	ParentClassifyId int `description:"父级分类id"`
 	PrevClassifyId   int `description:"上一个兄弟节点分类id"`
 	NextClassifyId   int `description:"下一个兄弟节点分类id"`
-}
+}
+
+// GetHelpDocClassifyLevel
+func GetHelpDocClassifyLevel() (items []*HelpDocClassifyItems, err error) {
+	o := orm.NewOrm()
+	sql := ``
+	sql = ` SELECT * FROM help_doc_classify WHERE level IN (1,2) `
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}
+
+type EditHelpDocClassifyVisibleReq struct {
+	HelpDocClassifyId  int `description:"分类id"`
+	VisibleBusinessIds string
+}
+
+func EditHelpDocClassifyVisible(classifyId int, visibleBusinessIds string) (err error) {
+	o := orm.NewOrm()
+	sql := `UPDATE help_doc_classify SET visible_business_ids=?, modify_time=NOW() WHERE classify_id=? `
+	_, err = o.Raw(sql, visibleBusinessIds, classifyId).Exec()
+	return
+}

models/help_doc/help_doc.go

@@ -85,7 +85,7 @@ type EditHelpDocReq struct {
 }
 
 func EditHelpDoc(item *HelpDoc, reportId int64) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	o := orm.NewOrm()
 	sql := `UPDATE help_doc
 			SET
 			  classify_id =?,
@@ -142,7 +142,7 @@ func GetHelpDocList(condition string, pars []interface{}, startSize, pageSize in
 	if condition != "" {
 		sql += condition
 	}
-	sql += `ORDER BY modify_time DESC LIMIT ?,?`
+	sql += `ORDER BY create_time DESC LIMIT ?,?`
 	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
 	return
 }

routers/commentsRouter.go

@@ -6595,6 +6595,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/help_doc:HelpDocClassifyController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/help_doc:HelpDocClassifyController"],
+        beego.ControllerComments{
+            Method: "EditClassifyVisible",
+            Router: `/classify/visible/edit`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/help_doc:HelpDocController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/help_doc:HelpDocController"],
         beego.ControllerComments{
             Method: "Add",