Merge branch 'need/cygx_967' of http://8.136.199.33:3000/cxzhang/hongze_clpt into debug

controllers/home.go

@@ -7,7 +7,6 @@ import (
 	"hongze/hongze_clpt/utils"
 	"strconv"
 	"strings"
-	"time"
 )
 
 type HomeController struct {
@@ -310,10 +309,10 @@ func (this *MobileHomeController) NewList() {
 		conditionInit += " AND chart_permission_id  =  " + strconv.Itoa(chartPermissionId)
 	}
 
-	if tagIds == "" && chartPermissionId == 0 {
-		//查询近一个月的数据
-		conditionInit += " AND publish_date  >   '" + time.Now().AddDate(0, 0, -30).Format(utils.FormatDateTime) + "'"
-	}
+	//if tagIds == "" && chartPermissionId == 0 {
+	//	//查询近一个月的数据
+	//	conditionInit += " AND publish_date  >   '" + time.Now().AddDate(0, 0, -30).Format(utils.FormatDateTime) + "'"
+	//}
 	//return
 	//conditionInit += `  AND source IN ('newchart')`
 	//if user.CompanyId <= 1 {

controllers/tag.go

@@ -10,24 +10,28 @@ type TagController struct {
 	BaseAuthController
 }
 
+type TagCommonController struct {
+	BaseCommonController
+}
+
 // @Title 获取标签列表-自定义顺序
 // @Description 获取标签列表-自定义顺序接口
 // @Success 200 {object} cygx.ChartPermissionResp
 // @router /list/custom [get]
-func (this *TagController) TagCustomizeList() {
+func (this *TagCommonController) TagCustomizeList() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
 
-	sysUser := this.User
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
+	//sysUser := this.User
+	//if sysUser == nil {
+	//	br.Msg = "请登录"
+	//	br.ErrMsg = "请登录，SysUser Is Empty"
+	//	br.Ret = 408
+	//	return
+	//}
 
 	var condition string
 	var resp models.CygxTagListResp

routers/commentsRouter.go

@@ -916,20 +916,20 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["hongze/hongze_clpt/controllers:TagController"] = append(beego.GlobalControllerRouter["hongze/hongze_clpt/controllers:TagController"],
+    beego.GlobalControllerRouter["hongze/hongze_clpt/controllers:TagCommonController"] = append(beego.GlobalControllerRouter["hongze/hongze_clpt/controllers:TagCommonController"],
         beego.ControllerComments{
-            Method: "History",
-            Router: `/add/history`,
-            AllowHTTPMethods: []string{"post"},
+            Method: "TagCustomizeList",
+            Router: `/list/custom`,
+            AllowHTTPMethods: []string{"get"},
             MethodParams: param.Make(),
             Filters: nil,
             Params: nil})
 
     beego.GlobalControllerRouter["hongze/hongze_clpt/controllers:TagController"] = append(beego.GlobalControllerRouter["hongze/hongze_clpt/controllers:TagController"],
         beego.ControllerComments{
-            Method: "TagCustomizeList",
-            Router: `/list/custom`,
-            AllowHTTPMethods: []string{"get"},
+            Method: "History",
+            Router: `/add/history`,
+            AllowHTTPMethods: []string{"post"},
             MethodParams: param.Make(),
             Filters: nil,
             Params: nil})

routers/router.go

@@ -147,6 +147,7 @@ func init() {
 		web.NSNamespace("/tag",
 			web.NSInclude(
 				&controllers.TagController{},
+				&controllers.TagCommonController{},
 			),
 		),
 		web.NSNamespace("/collection",