no message

controllers/cygx/contract_allocation.go

@@ -169,22 +169,19 @@ func (this *ContractAllocationController) CompanyContractList() {
 	if adminId != "" {
 		condition += ` AND c.seller_id in  (` + adminId + `) `
 		//pars = append(pars, adminId)
-	} else {
-		//权益申请销售只能看到自己名下的客户的申请
-		companyIds, err := cygxService.GetAdminLookUserCompanyIdsBySelf(sysUser)
-		if err != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取失败，GetAdminLookUserCompanyIds Err:" + err.Error()
-			return
-		}
-		lencompanyIds := len(companyIds)
-		if lencompanyIds > 0 {
-			condition += ` AND c.company_id IN (` + utils.GetOrmInReplace(lencompanyIds) + `)`
-			pars = append(pars, companyIds)
-		}
-		////根据当前角色来获取查询条件
-		//condition, pars = getQueryParams(condition, pars, sysUser, "c.")
+	}
 
+	//权益申请销售只能看到自己名下的客户的申请
+	companyIds, err := cygxService.GetAdminLookUserCompanyIdsBySelf(sysUser)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，GetAdminLookUserCompanyIds Err:" + err.Error()
+		return
+	}
+	lencompanyIds := len(companyIds)
+	if lencompanyIds > 0 {
+		condition += ` AND c.company_id IN (` + utils.GetOrmInReplace(lencompanyIds) + `)`
+		pars = append(pars, companyIds)
 	}
 
 	//关键字搜索
@@ -536,7 +533,6 @@ func (this *ContractAllocationController) CompanyContracDetail() {
 	var expensiveYx int
 	for _, n := range raiPermissions {
 		match := hasMap[n.ChartPermissionId]
-		fmt.Println(match, n.ChartPermissionId)
 		if match == nil {
 			continue
 		}
@@ -653,8 +649,18 @@ func (this *ContractAllocationController) CompanyContracDetail() {
 		br.ErrMsg = "获取合同列表失败，GetMapIsGrayByCompanyContractIds Err:" + err.Error()
 		return
 	}
+
+	permissionNameArr := []string{"医药", "消费", "科技", "智造", "策略"}
+	for _, v := range permissionNameArr {
+		for _, v2 := range respList {
+			if v2.ChartPermissionName == v {
+				resp.List = append(resp.List, v2)
+			}
+		}
+	}
+
 	resp.IsGray = mapIsGray[companyContractId]
-	resp.List = respList
+	//resp.List = respList
 	resp.CompanyContractId = companyContractId
 	br.Ret = 200
 	br.Success = true

services/cygx/contract_allocation.go

@@ -56,6 +56,8 @@ func GetCompanyContractPermissionNameMapById(companyContractIds []int) (mapContr
 		err = errors.New("GetCompanyContractPermissionList, Err: " + e.Error())
 		return
 	}
+
+	mapIsUpgrade := make(map[string]bool) //合同ID对应的行业是否有升级
 	for _, v := range companyContractPermissionList {
 		//如果开通的不是整个套餐，那么就做单独的子权限处理
 		if strings.Count(mapContractIdPerssion[(v.CompanyContractId)], "w套餐") == 0 {
@@ -67,10 +69,16 @@ func GetCompanyContractPermissionNameMapById(companyContractIds []int) (mapContr
 				}
 			} else {
 				mapContractIdPerssion[(v.CompanyContractId)] += mappermissionName[v.ChartPermissionId] + ","
+				if v.IsUpgrade == 1 {
+					//合同ID，权限名称形成唯一的主键索引
+					perssionName := mappermissionName[v.ChartPermissionId]
+					perssionName = strings.Replace(perssionName, "(客观)", "", -1)
+					perssionName = strings.Replace(perssionName, "(主观)", "", -1)
+					mapIsUpgrade[fmt.Sprint(v.CompanyContractId, "perssionName", perssionName)] = true
+				}
 			}
 		}
 	}
-
 	//合并客观权限
 	for k, v := range mapContractIdPerssion {
 		perssionName := v
@@ -90,6 +98,7 @@ func GetCompanyContractPermissionNameMapById(companyContractIds []int) (mapContr
 			perssionName = strings.Replace(perssionName, "智造(主观)", "智造", -1)
 			perssionName = strings.Replace(perssionName, "智造(客观)", "", -1)
 		}
+
 		perssionName = strings.TrimRight(perssionName, ",")
 		mapContractIdPerssion[k] = perssionName
 	}
@@ -103,6 +112,9 @@ func GetCompanyContractPermissionNameMapById(companyContractIds []int) (mapContr
 			if vName == "" {
 				continue
 			}
+			if mapIsUpgrade[fmt.Sprint(k, "perssionName", vName)] {
+				vName += "(升级)"
+			}
 			nameArr = append(nameArr, vName)
 		}
 		mapContractResp[k] = strings.Join(nameArr, ",")