mmm-go / oppmg · 提交

转到一个项目

作者 tangxvhui
提交 0a5c2a8da8ed59257e2be4a90a79c6275ed0a81d 2 个父辈 ae2f34d0 b1daaf8f

Merge branch 'dev' into test

内嵌 并排对比
正在显示 3 个修改的文件 包含 80 行增加 和 62 行删除
@@ -39,57 +39,57 @@ type PermissionBase struct { @@ -39,57 +39,57 @@ type PermissionBase struct {
39 } 39 }
40 40
41 var RouterPermission = map[string]PermissionBase{ 41 var RouterPermission = map[string]PermissionBase{
42 - "/v1/department/list": PermissionBase{CodeName: M_ENTERPRISE_ORGANIZATION, ActionName: "default"},  
43 - "/v1/department/add": PermissionBase{CodeName: M_ENTERPRISE_ORGANIZATION, ActionName: "default"},  
44 - "/v1/department/edit": PermissionBase{CodeName: M_ENTERPRISE_ORGANIZATION, ActionName: "default"},  
45 - "/v1/department/delete": PermissionBase{CodeName: M_ENTERPRISE_ORGANIZATION, ActionName: "default"},  
46 - "/v1/company/current/edit": PermissionBase{CodeName: M_ENTERPRISE_PROFILE, ActionName: "default"},  
47 - "/v1/company/current/info": PermissionBase{CodeName: M_ENTERPRISE_PROFILE, ActionName: "default"},  
48 - "/v1/position/list": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_POST, ActionName: "default"},  
49 - "/v1/position/add": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_POST, ActionName: "default"},  
50 - "/v1/position/edit": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_POST, ActionName: "default"},  
51 - "/v1/position/delete": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_POST, ActionName: "default"},  
52 - "/v1/rbac/role/list": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},  
53 - "/v1/rbac/role/add": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},  
54 - "/v1/rbac/role/edit": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},  
55 - "/v1/rbac/role/delete": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},  
56 - "/v1/rbac/role_group/add": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},  
57 - "/v1/rbac/role_group/edit": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},  
58 - "/v1/rbac/role_group/delete": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},  
59 - "/v1/rbac/role/menu": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},  
60 - "/v1/rbac/menu/list": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},  
61 - "/v1/rbac/role/menu/edit": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},  
62 - "/v1/rbac/menu/opportunity": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},  
63 - "/v1/rbac/menu/opportunity/edit": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},  
64 - "/v1/user/list": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE, ActionName: "default"},  
65 - "/v1/user/add": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE, ActionName: "default"},  
66 - "/v1/user/edit": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE, ActionName: "default"},  
67 - "/v1/user/delete": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE, ActionName: "default"},  
68 - "/v1/user/allow_forbid": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE, ActionName: "default"},  
69 - "/v1/user/info": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE, ActionName: "default"},  
70 - "/v1/bulletin/add": PermissionBase{CodeName: M_SYSTEM_ANNOUNCEMENT, ActionName: "default"},  
71 - "/v1/bulletin/list": PermissionBase{CodeName: M_SYSTEM_ANNOUNCEMENT, ActionName: "default"},  
72 - "/v1/bulletin/get": PermissionBase{CodeName: M_SYSTEM_ANNOUNCEMENT, ActionName: "default"},  
73 - "/v1/bulletin/update": PermissionBase{CodeName: M_SYSTEM_ANNOUNCEMENT, ActionName: "default"},  
74 - "/v1/bulletin/operate": PermissionBase{CodeName: M_SYSTEM_ANNOUNCEMENT, ActionName: "default"},  
75 - "/v1/bulletin/feedbacks": PermissionBase{CodeName: M_SYSTEM_ANNOUNCEMENT, ActionName: "default"},  
76 - "/v1/bulletin/exportFeedBacks": PermissionBase{CodeName: M_SYSTEM_ANNOUNCEMENT, ActionName: "default"},  
77 - "/v1/template/add": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},  
78 - "/v1/template/sortCategory": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},  
79 - "/v1/template/list": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},  
80 - "/v1/template/get": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},  
81 - "/v1/template/update": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},  
82 - "/v1/template/delete": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},  
83 - "/v1/template/editVisible": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},  
84 - "/v1/template/editEnable": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},  
85 - "/v1/template/editSort": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},  
86 - "/v1/template/operateCategory": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},  
87 - "/v1/template/deleteCategory": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},  
88 - "/v1/config/score": PermissionBase{CodeName: M_SYSTEM_RATING, ActionName: "default"},  
89 - "/v1/config/score/get": PermissionBase{CodeName: M_SYSTEM_RATING, ActionName: "default"},  
90 - "/v1/audit/list": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY, ActionName: "check"},  
91 - "/v1/chance/store/change": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY, ActionName: "default"},  
92 - //"/v1/chance/export_chance_list": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY, ActionName: "default"}, 42 + "/v1/department/list": PermissionBase{CodeName: M_ENTERPRISE_ORGANIZATION, ActionName: "default"},
  43 + "/v1/department/add": PermissionBase{CodeName: M_ENTERPRISE_ORGANIZATION, ActionName: "default"},
  44 + "/v1/department/edit": PermissionBase{CodeName: M_ENTERPRISE_ORGANIZATION, ActionName: "default"},
  45 + "/v1/department/delete": PermissionBase{CodeName: M_ENTERPRISE_ORGANIZATION, ActionName: "default"},
  46 + "/v1/company/current/edit": PermissionBase{CodeName: M_ENTERPRISE_PROFILE, ActionName: "default"},
  47 + "/v1/company/current/info": PermissionBase{CodeName: M_ENTERPRISE_PROFILE, ActionName: "default"},
  48 + "/v1/position/list": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_POST, ActionName: "default"},
  49 + "/v1/position/add": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_POST, ActionName: "default"},
  50 + "/v1/position/edit": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_POST, ActionName: "default"},
  51 + "/v1/position/delete": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_POST, ActionName: "default"},
  52 + "/v1/rbac/role/list": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
  53 + "/v1/rbac/role/add": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
  54 + "/v1/rbac/role/edit": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
  55 + "/v1/rbac/role/delete": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
  56 + "/v1/rbac/role_group/add": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
  57 + "/v1/rbac/role_group/edit": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
  58 + "/v1/rbac/role_group/delete": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
  59 + "/v1/rbac/role/menu": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
  60 + "/v1/rbac/menu/list": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
  61 + "/v1/rbac/role/menu/edit": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
  62 + "/v1/rbac/menu/opportunity": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
  63 + "/v1/rbac/menu/opportunity/edit": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
  64 + "/v1/user/list": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE, ActionName: "default"},
  65 + "/v1/user/add": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE, ActionName: "default"},
  66 + "/v1/user/edit": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE, ActionName: "default"},
  67 + "/v1/user/delete": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE, ActionName: "default"},
  68 + "/v1/user/allow_forbid": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE, ActionName: "default"},
  69 + "/v1/user/info": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE, ActionName: "default"},
  70 + "/v1/bulletin/add": PermissionBase{CodeName: M_SYSTEM_ANNOUNCEMENT, ActionName: "default"},
  71 + "/v1/bulletin/list": PermissionBase{CodeName: M_SYSTEM_ANNOUNCEMENT, ActionName: "default"},
  72 + "/v1/bulletin/get": PermissionBase{CodeName: M_SYSTEM_ANNOUNCEMENT, ActionName: "default"},
  73 + "/v1/bulletin/update": PermissionBase{CodeName: M_SYSTEM_ANNOUNCEMENT, ActionName: "default"},
  74 + "/v1/bulletin/operate": PermissionBase{CodeName: M_SYSTEM_ANNOUNCEMENT, ActionName: "default"},
  75 + "/v1/bulletin/feedbacks": PermissionBase{CodeName: M_SYSTEM_ANNOUNCEMENT, ActionName: "default"},
  76 + "/v1/bulletin/exportFeedBacks": PermissionBase{CodeName: M_SYSTEM_ANNOUNCEMENT, ActionName: "default"},
  77 + "/v1/template/add": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},
  78 + "/v1/template/sortCategory": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},
  79 + "/v1/template/list": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},
  80 + "/v1/template/get": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},
  81 + "/v1/template/update": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},
  82 + "/v1/template/delete": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},
  83 + "/v1/template/editVisible": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},
  84 + "/v1/template/editEnable": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},
  85 + "/v1/template/editSort": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},
  86 + "/v1/template/operateCategory": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},
  87 + "/v1/template/deleteCategory": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},
  88 + "/v1/config/score": PermissionBase{CodeName: M_SYSTEM_RATING, ActionName: "default"},
  89 + "/v1/config/score/get": PermissionBase{CodeName: M_SYSTEM_RATING, ActionName: "default"},
  90 + "/v1/audit/list": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY, ActionName: "check"},
  91 + "/v1/chance/store/change": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY, ActionName: "chance_store_change"},
  92 + "/v1/chance/export_chance_list": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY, ActionName: "export_excel"},
93 "/v1/audit/info": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY, ActionName: "check"}, 93 "/v1/audit/info": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY, ActionName: "check"},
94 "/v1/audit/allow_forbid": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY, ActionName: "close_chance"}, 94 "/v1/audit/allow_forbid": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY, ActionName: "close_chance"},
95 "/v1/rank/type/list": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"}, 95 "/v1/rank/type/list": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"},
@@ -94,13 +94,15 @@ type CheckOpp struct { @@ -94,13 +94,15 @@ type CheckOpp struct {
94 94
95 //OptionOpportunity 机会管理 高级权限设置 95 //OptionOpportunity 机会管理 高级权限设置
96 type OptionOpportunity struct { 96 type OptionOpportunity struct {
97 - Check int `json:"check"`  
98 - CheckMap map[int]int `json:"check_map,omitempty"`  
99 - CheckOption *CheckOpp `json:"check_option,omitempty"`  
100 - EditSorce int `json:"edit_sorce"`  
101 - EditPublicStatus int `json:"edit_public_status"`  
102 - CloseChance int `json:"close_chance"`  
103 - EditChance int `json:"edit_chance"` 97 + Check int `json:"check"`
  98 + CheckMap map[int]int `json:"check_map,omitempty"`
  99 + CheckOption *CheckOpp `json:"check_option,omitempty"`
  100 + EditSorce int `json:"edit_sorce"`
  101 + EditPublicStatus int `json:"edit_public_status"`
  102 + CloseChance int `json:"close_chance"`
  103 + EditChance int `json:"edit_chance"`
  104 + ExportExcel int `json:"export_excel"` //导出数据权限
  105 + ChanceStoreChange int `json:"chance_store_chance"` //移到机会池/储备池
104 } 106 }
105 107
106 /* 108 /*
@@ -134,10 +136,12 @@ func NewOptionOpportunity() PermissionOptionObject { @@ -134,10 +136,12 @@ func NewOptionOpportunity() PermissionOptionObject {
134 //GetValidFunc PermissionOptionBase 接口实现 136 //GetValidFunc PermissionOptionBase 接口实现
135 func (p *OptionOpportunity) GetValidFunc(k string) bool { 137 func (p *OptionOpportunity) GetValidFunc(k string) bool {
136 m := map[string]func() bool{ 138 m := map[string]func() bool{
137 - "check": p.ValidCheck,  
138 - "edit_sorce": p.ValidEditSorce,  
139 - "close_chance": p.ValidCloseChance,  
140 - "edit_public_status": p.ValidEditPublicStatus, 139 + "check": p.ValidCheck,
  140 + "edit_sorce": p.ValidEditSorce,
  141 + "close_chance": p.ValidCloseChance,
  142 + "edit_public_status": p.ValidEditPublicStatus,
  143 + "export_excel": p.ValidExportExcel,
  144 + "chance_store_change": p.ValidChanceStoreChange,
141 } 145 }
142 146
143 if fn, ok := m[k]; ok { 147 if fn, ok := m[k]; ok {
@@ -225,6 +229,20 @@ func (p *OptionOpportunity) ValidEditPublicStatus() bool { @@ -225,6 +229,20 @@ func (p *OptionOpportunity) ValidEditPublicStatus() bool {
225 return false 229 return false
226 } 230 }
227 231
  232 +func (p *OptionOpportunity) ValidExportExcel() bool {
  233 + if p.ExportExcel > 0 {
  234 + return true
  235 + }
  236 + return false
  237 +}
  238 +
  239 +func (p *OptionOpportunity) ValidChanceStoreChange() bool {
  240 + if p.ChanceStoreChange > 0 {
  241 + return true
  242 + }
  243 + return false
  244 +}
  245 +
228 func (p *OptionOpportunity) ValidCloseChance() bool { 246 func (p *OptionOpportunity) ValidCloseChance() bool {
229 if p.CloseChance > 0 { 247 if p.CloseChance > 0 {
230 return true 248 return true