wip:tj

config.yaml

@@ -98,14 +98,6 @@ examine:
 
 specialService: ["市场分析定制报告下载包","企业中标分析报告下载包","业主采购分析报告下载包"]
 
-#销售业绩默认渠道设置
-deptDefaultChannel:
-  26820: "x020" #销售一部/电销部及其下属部门
-  27955: "x020" #销售三部
-  27275: "x021" #销售一部/大客户部
-  59006: "x021" #数据事业部及下属部门
-  59010: "x021" #市场部及下属部门
-  59005: "x022" #运营部/客户成功组
 
 zeroOrderType: [ "赠送","分期付款补充权益","原订单不支持开通多项权益" ]
 

global.yaml

@@ -7,10 +7,7 @@ webDomain:
 #销售业绩默认渠道设置
 deptDefaultChannel:
   58435: "x020" #销售一部及其下属部门
-  27955: "x020" #销售三部
-  59006: "x021" #数据事业部及下属部门
-  59010: "x021" #市场部及下属部门
-  59005: "x022" #运营部/客户成功组
+
 
 #销售部门
 saleDeptShowArr: ["销售一部","产品部","运营部","销售三部","市场部","数据事业部","质量部"]

internal/controller/commonHandler.go

@@ -14,7 +14,7 @@ import (
 func GetSelectItemHandler(r *ghttp.Request) {
 	rData, err := func() (interface{}, error) {
 		displayMap := make(map[string]interface{})
-		for deptId, channelCode := range g.Cfg().MustGet(gctx.New(), "deptDefaultChannel").Map() {
+		for deptId, channelCode := range g.Cfg("global").MustGet(gctx.New(), "deptDefaultChannel").Map() {
 			displayMap[deptId] = channelCode
 			for _, node := range jyutil.JyDepartmentManager.GetDeptAllChildNode(gconv.Int(deptId)) {
 				displayMap[gconv.String(node.Id)] = channelCode

internal/logic/order/salesChannelItem.go

@@ -25,7 +25,7 @@ func SalesChannelItem(ctx context.Context) (map[string]interface{}, error) {
 	}
 
 	displayMap := make(map[string]interface{})
-	for deptId, channelCode := range g.Cfg().MustGet(gctx.New(), "deptDefaultChannel").Map() {
+	for deptId, channelCode := range g.Cfg("global").MustGet(gctx.New(), "deptDefaultChannel").Map() {
 		displayMap[deptId] = channelCode
 		for _, node := range jyutil.JyDepartmentManager.GetDeptAllChildNode(gconv.Int(deptId)) {
 			displayMap[gconv.String(node.Id)] = channelCode