|
@@ -75,6 +75,17 @@ func (c *CompanyContractCommon) ApplyContractDetail() {
|
|
|
c.FailWithMessage("获取失败", "获取权限信息失败,Err:"+err.Error())
|
|
|
return
|
|
|
}
|
|
|
+ mapUpgrade := make(map[int]int)
|
|
|
+ permissionList, err := company_report_permission.GetCompanyContractPermissionByCompanyContractId(companyContractId)
|
|
|
+ if err != nil && err.Error() != utils.ErrNoRow() {
|
|
|
+ c.FailWithMessage("获取失败", "获取合同权限信息失败,Err:"+err.Error())
|
|
|
+ return
|
|
|
+ }
|
|
|
+ for _, v := range permissionList {
|
|
|
+ if v.IsUpgrade == 1 {
|
|
|
+ mapUpgrade[v.ChartPermissionId] = v.ChartPermissionId
|
|
|
+ }
|
|
|
+ }
|
|
|
for _, n := range items {
|
|
|
count, err := company_contract.GetCompanyContractPermissionCheckByContractId(companyId, detail.CompanyContractId, n.ChartPermissionId)
|
|
|
if err != nil {
|
|
@@ -92,6 +103,17 @@ func (c *CompanyContractCommon) ApplyContractDetail() {
|
|
|
detail.PermissionList = append(detail.PermissionList, plist)
|
|
|
// CRM8.8-权限主客观合并
|
|
|
newPermissionLookList := contract.HandleEquityPermissionLookList(detail.PermissionList)
|
|
|
+ if len(mapUpgrade) > 0 {
|
|
|
+ for _, n := range newPermissionLookList {
|
|
|
+ if n.ClassifyName == "权益" {
|
|
|
+ for _, n2 := range n.Items {
|
|
|
+ if _, ok := mapUpgrade[n2.ChartPermissionId]; ok {
|
|
|
+ n2.PermissionName += "(升级)"
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
detail.PermissionList = newPermissionLookList
|
|
|
}
|
|
|
resp := companyContractResp.CompanyContractDetailResp{
|