自用商家主库处理

controllers/classify.go

@@ -60,7 +60,6 @@ func (this *ClassifyController) Add() {
 		br.Msg = "非一级分类不可添加子目录"
 		return
 	}
-
 	if menuMap[system.MenuSpecialHandleClassifyReportImgs] && (req.ShowType == 1 || req.ShowType == 3) && req.YbRightBanner == "" && req.ParentId == 0 { //当一级报告分类为列表、品种时，增加“报告合集配图”的配置项
 		br.Msg = "报告合集配图不可为空"
 		return

controllers/company_permission.go

@@ -81,101 +81,3 @@ func (this *CompanyPermissionController) List() {
 	br.Msg = "获取成功"
 	br.Data = resp
 }
-
-// PermissionVariety
-// @Title 品种
-// @Description 品种接口
-// @Param   CompanyType   query   string  true       "客户类型：传空字符串或者不传为全部,'ficc','权益'"
-// @Success 200 {object} company.PermissionVarietyResp
-// @router /permission/variety [get]
-func (this *CompanyPermissionController) PermissionVariety() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-
-	companyType := this.GetString("CompanyType")
-
-	var productId int
-	resp := new(company.PermissionVarietyResp)
-
-	roleTypeCode := sysUser.RoleTypeCode
-	if roleTypeCode == utils.ROLE_TYPE_CODE_RAI_SELLER || roleTypeCode == utils.ROLE_TYPE_CODE_RAI_ADMIN {
-		productId = 2
-	} else if roleTypeCode == utils.ROLE_TYPE_CODE_FICC_SELLER || roleTypeCode == utils.ROLE_TYPE_CODE_FICC_ADMIN {
-		productId = 1
-	} else {
-		productId = 0
-	}
-
-	if productId == 1 {
-		for k, v := range utils.PermissionFiccClassifyArr {
-			p := new(company.PermissionVarietyList)
-			p.ClassifyName = v
-			p.ChartPermissionId = k + 100
-			items, err := company.GetPermissionVarietyItems(productId, v)
-			if err != nil {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
-				return
-			}
-			p.Items = items
-			resp.List = append(resp.List, p)
-		}
-	} else if productId == 2 {
-		v := "权益"
-		p := new(company.PermissionVarietyList)
-		p.ClassifyName = v
-		p.ChartPermissionId = 105
-		items, err := company.GetPermissionVarietyItems(productId, v)
-		if err != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
-			return
-		}
-		p.Items = items
-		resp.List = append(resp.List, p)
-	} else {
-		if companyType == utils.COMPANY_PRODUCT_FICC_NAME {
-			for k, v := range utils.PermissionFiccClassifyArr {
-				p := new(company.PermissionVarietyList)
-				p.ClassifyName = v
-				p.ChartPermissionId = k + 100
-				items, err := company.GetPermissionVarietyItems(1, v)
-				if err != nil {
-					br.Msg = "获取失败"
-					br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
-					return
-				}
-				p.Items = items
-				resp.List = append(resp.List, p)
-			}
-		} else if companyType == utils.COMPANY_PRODUCT_RAI_NAME {
-			v := "权益"
-			p := new(company.PermissionVarietyList)
-			p.ClassifyName = v
-			p.ChartPermissionId = 105
-			items, err := company.GetPermissionVarietyItems(2, v)
-			if err != nil {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
-				return
-			}
-			p.Items = items
-			resp.List = append(resp.List, p)
-		}
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resp
-}

controllers/report.go

@@ -876,6 +876,13 @@ func (this *ReportController) SendTemplateMsg() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
+	if utils.BusinessCode != utils.BusinessCodeRelease {
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "操作成功"
+		return
+	}
+
 	var req models.SendTemplateMsgReq
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
 	if err != nil {
@@ -1414,7 +1421,6 @@ func (this *ReportController) GetDayWeekReportChapterTypeList() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-
 	sysUser := this.SysUser
 	if sysUser == nil {
 		br.Msg = "请登录"
@@ -1422,6 +1428,12 @@ func (this *ReportController) GetDayWeekReportChapterTypeList() {
 		br.Ret = 408
 		return
 	}
+	if utils.BusinessCode != utils.BusinessCodeRelease {
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "操作成功"
+		return
+	}
 
 	var condition string
 	var pars []interface{}
@@ -1526,6 +1538,12 @@ func (this *ReportController) GetDayWeekReportPauseTime() {
 		br.Ret = 408
 		return
 	}
+	if utils.BusinessCode != utils.BusinessCodeRelease {
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "操作成功"
+		return
+	}
 
 	list, err := models.GetDayWeekReportPauseTimeList()
 	if err != nil {
@@ -1560,6 +1578,12 @@ func (this *ReportController) SetDayWeekReportUpdateRule() {
 		br.Ret = 408
 		return
 	}
+	if utils.BusinessCode != utils.BusinessCodeRelease {
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "操作成功"
+		return
+	}
 
 	var req models.SetDayWeekReportUpdateRuleReq
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
@@ -1607,6 +1631,12 @@ func (this *ReportController) SetDayWeekReportEnableRule() {
 		br.Ret = 408
 		return
 	}
+	if utils.BusinessCode != utils.BusinessCodeRelease {
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "操作成功"
+		return
+	}
 
 	var req models.SetDayWeekReportEnableUpdateRuleReq
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
@@ -1648,7 +1678,6 @@ func (this *ReportController) AddDayWeekReport() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-
 	sysUser := this.SysUser
 	if sysUser == nil {
 		br.Msg = "请登录"
@@ -1656,6 +1685,12 @@ func (this *ReportController) AddDayWeekReport() {
 		br.Ret = 408
 		return
 	}
+	if utils.BusinessCode != utils.BusinessCodeRelease {
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "操作成功"
+		return
+	}
 
 	var req models.SaveDayWeekReportReq
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
@@ -1847,7 +1882,6 @@ func (this *ReportController) EditDayWeekReport() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-
 	sysUser := this.SysUser
 	if sysUser == nil {
 		br.Msg = "请登录"
@@ -1855,6 +1889,12 @@ func (this *ReportController) EditDayWeekReport() {
 		br.Ret = 408
 		return
 	}
+	if utils.BusinessCode != utils.BusinessCodeRelease {
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "操作成功"
+		return
+	}
 
 	var req models.SaveDayWeekReportReq
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
@@ -1926,6 +1966,12 @@ func (this *ReportController) GetReportChapterList() {
 		br.Ret = 408
 		return
 	}
+	if utils.BusinessCode != utils.BusinessCodeRelease {
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "操作成功"
+		return
+	}
 
 	reqReportId := this.GetString("ReportId")
 	reportId, _ := strconv.Atoi(reqReportId)
@@ -2044,6 +2090,12 @@ func (this *ReportController) GetLastDayWeekReportChapter() {
 		br.Ret = 408
 		return
 	}
+	if utils.BusinessCode != utils.BusinessCodeRelease {
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "操作成功"
+		return
+	}
 
 	typeId, _ := this.GetInt("TypeId")
 	reportType := this.GetString("ReportType")
@@ -2347,7 +2399,6 @@ func (this *ReportController) GetDayReportTickerList() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-
 	sysUser := this.SysUser
 	if sysUser == nil {
 		br.Msg = "请登录"
@@ -2355,6 +2406,12 @@ func (this *ReportController) GetDayReportTickerList() {
 		br.Ret = 408
 		return
 	}
+	if utils.BusinessCode != utils.BusinessCodeRelease {
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "操作成功"
+		return
+	}
 
 	reportChapterId, _ := this.GetInt("ReportChapterId")
 	if reportChapterId <= 0 {
@@ -2456,6 +2513,12 @@ func (this *ReportController) IsLastDayWeekReportChapter() {
 		br.Ret = 408
 		return
 	}
+	if utils.BusinessCode != utils.BusinessCodeRelease {
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "操作成功"
+		return
+	}
 
 	reportChapterId, _ := this.GetInt("ReportChapterId")
 	if reportChapterId <= 0 {
@@ -2513,6 +2576,12 @@ func (this *ReportController) PublishDayWeekReportChapter() {
 		br.Ret = 408
 		return
 	}
+	if utils.BusinessCode != utils.BusinessCodeRelease {
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "操作成功"
+		return
+	}
 
 	var req models.PublishReportChapterReq
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
@@ -2702,6 +2771,12 @@ func (this *ReportController) PublishDayWeekReport() {
 		br.Ret = 408
 		return
 	}
+	if utils.BusinessCode != utils.BusinessCodeRelease {
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "操作成功"
+		return
+	}
 
 	var req models.PublishDayWeekReportReq
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
@@ -2761,6 +2836,13 @@ func (this *ReportController) GetSunCode() {
 		br.Ret = 408
 		return
 	}
+	if utils.BusinessCode != utils.BusinessCodeRelease {
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "操作成功"
+		return
+	}
+
 	var req models.SunCodeReq
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
 	if err != nil {
@@ -2807,7 +2889,6 @@ func (this *ReportController) GetStopDayWeekReportChapterTypeList() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-
 	sysUser := this.SysUser
 	if sysUser == nil {
 		br.Msg = "请登录"
@@ -2815,6 +2896,12 @@ func (this *ReportController) GetStopDayWeekReportChapterTypeList() {
 		br.Ret = 408
 		return
 	}
+	if utils.BusinessCode != utils.BusinessCodeRelease {
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "获取成功"
+		return
+	}
 
 	stopDay := make([]*models.ReportChapterType, 0)
 	stopWeek := make([]*models.ReportChapterType, 0)
@@ -2930,6 +3017,12 @@ func (this *ReportController) SendMsg() {
 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
 		return
 	}
+	if utils.BusinessCode != utils.BusinessCodeRelease {
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "操作成功"
+		return
+	}
 	if req.ReportId <= 0 {
 		br.Msg = "参数错误"
 		br.ErrMsg = "参数错误"

controllers/report_chapter_type.go

@@ -464,6 +464,13 @@ func (this *ReportChapterTypeController) PermissionList() {
 		br.Ret = 408
 		return
 	}
+	if utils.BusinessCode != utils.BusinessCodeRelease {
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "操作成功"
+		return
+	}
+
 	typeId, _ := this.GetInt("ReportChapterTypeId")
 	if typeId <= 0 {
 		br.Msg = "参数有误"

controllers/research_group.go

@@ -3,6 +3,7 @@ package controllers
 import (
 	"hongze/hz_eta_api/models"
 	"hongze/hz_eta_api/services"
+	"hongze/hz_eta_api/utils"
 )
 
 type ResearchGroupController struct {
@@ -20,6 +21,13 @@ func (this *ResearchGroupController) GetResearchGroupList() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
+	if utils.BusinessCode != utils.BusinessCodeRelease {
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "操作成功"
+		return
+	}
+
 	include, _ := this.GetInt("Include")
 	list, err := services.GetResearchGroupTree(include)
 	if err != nil {

controllers/sys_admin.go

@@ -267,7 +267,7 @@ func (this *SysAdminController) ListSysuser() {
 		}
 	}
 	// 研究方向分组
-	if len(adminIdArr) > 0 {
+	if len(adminIdArr) > 0 && utils.BusinessCode == utils.BusinessCodeRelease {
 		//adminIds := strings.Join(adminIdArr, ",")
 		//researchGroupList, e := system.GetAdminResearchGroupListByAdminId(adminIds)
 		researchGroupList, e := models.GetAdminVarietyTagRelationListByAdminId(adminIdArr)

controllers/sys_role.go

@@ -582,10 +582,6 @@ func (this *SysRoleController) SysRoleMenuAuthSave() {
 		br.Msg = "请选择菜单"
 		return
 	}
-	if len(req.HalfMenuIds) == 0 {
-		br.Msg = "请选择菜单"
-		return
-	}
 
 	items := make([]*system.SysRoleMenu, 0)
 	for _, v := range req.MenuIds {

controllers/variety_tag.go

@@ -3,6 +3,7 @@ package controllers
 import (
 	"hongze/hz_eta_api/models"
 	"hongze/hz_eta_api/services"
+	"hongze/hz_eta_api/utils"
 )
 
 type VarietyTagController struct {
@@ -21,15 +22,27 @@ func (this *VarietyTagController) TagTree() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
+	// 非自用不请求
+	resp := make([]*services.TagTreeItem, 0)
+	if utils.BusinessCode != utils.BusinessCodeRelease {
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "获取成功"
+		br.Data = resp
+		return
+	}
+
 	hasResearcher, _ := this.GetInt("HasResearcher")    // 是否展示研究员：1展示， 0不展示
 	include, _ := this.GetInt("IncludeDisableMember")   // 是否包含被禁用的研究员标签
 	questionId, _ := this.GetInt("CommunityQuestionId") // 问答社区ID-用于区分哪些研究员不可选
-	resp, e := services.GetTagTree(hasResearcher, include, questionId)
+	list, e := services.GetTagTree(hasResearcher, include, questionId)
 	if e != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "TagTree-获取标签树失败, Err: " + e.Error()
 		return
 	}
+	resp = list
+
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"

models/company/company_permission.go

@@ -79,28 +79,6 @@ type PermissionLookItem struct {
 	Child              []*PermissionLookItem `description:"子权限"`
 }
 
-type PermissionVarietyResp struct {
-	List []*PermissionVarietyList
-}
-
-type PermissionVarietyItem struct {
-	ChartPermissionId int    `description:"权限id"`
-	ClassifyName      string `orm:"column(permission_name)" description:"权限名称"`
-}
-
-type PermissionVarietyList struct {
-	ChartPermissionId int    `description:"父级id"`
-	ClassifyName      string `description:"分类"`
-	Items             []*PermissionVarietyItem
-}
-
-func GetPermissionVarietyItems(productId int, classifyName string) (items []*PermissionVarietyItem, err error) {
-	o := orm.NewOrmUsingDB("weekly")
-	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=? GROUP BY permission_name ORDER BY sort ASC `
-	_, err = o.Raw(sql, productId, classifyName).QueryRows(&items)
-	return
-}
-
 // GetChartPermissionListById 根据权限id获取产品权限详情
 func GetChartPermissionListById(chartPermissionId int) (item *ChartPermission, err error) {
 	o := orm.NewOrmUsingDB("weekly")

models/report.go

@@ -862,14 +862,14 @@ type YbPcSuncode struct {
 
 // GetYbPcSunCode 获取太阳码
 func GetYbPcSunCode(scene, page string) (item *YbPcSuncode, err error) {
-	o := orm.NewOrmUsingDB("default")
+	o := orm.NewOrmUsingDB("weekly")
 	sql := `SELECT * FROM yb_pc_suncode WHERE scene = ? AND code_page = ? `
 	err = o.Raw(sql, scene, page).QueryRow(&item)
 	return
 }
 
 func AddYbPcSunCode(item *YbPcSuncode) (err error) {
-	o := orm.NewOrmUsingDB("default")
+	o := orm.NewOrmUsingDB("weekly")
 	_, err = o.Insert(item)
 	return
 }
@@ -883,7 +883,7 @@ type YbSuncodePars struct {
 }
 
 func AddYbSuncodePars(item *YbSuncodePars) (err error) {
-	o := orm.NewOrmUsingDB("default")
+	o := orm.NewOrmUsingDB("weekly")
 	_, err = o.Insert(item)
 	return
 }

models/system/sys_menu.go

@@ -131,7 +131,7 @@ func GetMenuButtonsByRoleId(roleId int) (items []*SysMenu, err error) {
 				sys_menu AS r
 			JOIN sys_role_menu AS rm ON r.menu_id = rm.menu_id AND rm.type = 0
 			WHERE
-				rm.role_id = ? AND r.menu_type = 1
+				rm.role_id = ? AND r.menu_type <> 0
 			ORDER BY
 				r.sort ASC,
 				r.create_time DESC`

routers/commentsRouter.go

@@ -4588,15 +4588,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["hongze/hz_eta_api/controllers:CompanyPermissionController"] = append(beego.GlobalControllerRouter["hongze/hz_eta_api/controllers:CompanyPermissionController"],
-        beego.ControllerComments{
-            Method: "PermissionVariety",
-            Router: `/permission/variety`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["hongze/hz_eta_api/controllers:CompanySellerController"] = append(beego.GlobalControllerRouter["hongze/hz_eta_api/controllers:CompanySellerController"],
         beego.ControllerComments{
             Method: "CheckListV2",

services/user.go

@@ -39,6 +39,9 @@ func SwitchHzUserEnabledByMobile(opEnabled int, mobile string) (err error) {
 
 // DeleteHzUserByMobile 根据手机号删除弘则研究下的联系人
 func DeleteHzUserByMobile(mobile string) (err error) {
+	if utils.BusinessCode != utils.BusinessCodeRelease {
+		return
+	}
 	if mobile == "" {
 		return
 	}