fix

models/chart_permission.go

@@ -53,22 +53,6 @@ type YbChartPermissionFirst struct {
 	YbIndexIcon  string `description:"研报小程序首页图标地址"`
 }
 
-// GetYbChartPermissionFirst 获取研报一级品种分类
-func GetYbChartPermissionFirst() (list []*YbChartPermissionFirst, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM chart_permission_first ORDER BY yb_index_sort ASC`
-	_, err = o.Raw(sql).QueryRows(&list)
-	return
-}
-
-// GetFiccPermissionExceptTactic 获取除了市场策略外的ficc权限
-func GetFiccPermissionExceptTactic() (items []*ChartPermission, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM chart_permission WHERE enabled = 1 AND permission_type = 0 AND product_id = 1 and classify_name != '市场策略' ORDER BY sort ASC`
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
 // GetPermissionByProductIdAndClassifyName 获取子分类
 func GetPermissionByProductIdAndClassifyName(productId int, classifyName string) (items []*ChartPermission, err error) {
 	o := orm.NewOrm()
@@ -77,14 +61,6 @@ func GetPermissionByProductIdAndClassifyName(productId int, classifyName string)
 	return
 }
 
-// GetYbChartPermissionFirstByName 根据分类名称获取一级分类
-func GetYbChartPermissionFirstByName(classifyName string) (item *YbChartPermissionFirst, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM chart_permission_first WHERE classify_name = ? LIMIT 1`
-	err = o.Raw(sql, classifyName).QueryRow(&item)
-	return
-}
-
 // GetChartPermissionById 主键获取权限
 func GetChartPermissionByRemark(remark string) (item *ChartPermission, err error) {
 	o := orm.NewOrm()

models/company/company_permission.go

@@ -1,10 +1,7 @@
 package company
 
 import (
-	"fmt"
 	"github.com/beego/beego/v2/client/orm"
-	"hongze/hz_eta_api/utils"
-	"strings"
 	"time"
 )
 
@@ -213,36 +210,6 @@ func GetPermissionIdById(permissionIds string) (allpermissionId string, err erro
 	return
 }
 
-// 通过主观ID获取对应的客观ID
-func GetCompanyPermissionIdById(companyId int) (allpermissionId string, err error) {
-	sql := `SELECT
-	GROUP_CONCAT( DISTINCT chart_permission_id SEPARATOR ',' ) AS permission 
-FROM
-	company_report_permission AS a 
-WHERE
-	a.company_id = ? 
-	AND product_id = 2`
-	o := orm.NewOrm()
-	err = o.Raw(sql, companyId).QueryRow(&allpermissionId)
-	return
-}
-
-type ContractPermissionList struct {
-	ClassifyName string `description:"分类"`
-	Items        []*PermissionLookItem
-	CheckList    []int
-	CheckAll     bool
-}
-
-func GetCompanyIdStr(permissionStr string) (company_id_str string, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT GROUP_CONCAT(DISTINCT company_id SEPARATOR ',') AS company_id_str
-          FROM company_report_permission AS a
-		  WHERE a.chart_permission_id IN( ` + permissionStr + `) `
-	err = o.Raw(sql).QueryRow(&company_id_str)
-	return
-}
-
 type PermissionVarietyResp struct {
 	List []*PermissionVarietyList
 }
@@ -265,20 +232,6 @@ func GetPermissionVarietyItems(productId int, classifyName string) (items []*Per
 	return
 }
 
-func GetCompanyReportPermission(companyId, productId int) (items []*CompanyReportPermission, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM company_report_permission WHERE company_id=? AND product_id=? `
-	_, err = o.Raw(sql, companyId, productId).QueryRows(&items)
-	return
-}
-
-func GetCompanyReportPermissionByStatus(companyId, productId int, status string) (items []*CompanyReportPermission, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM company_report_permission WHERE company_id=? AND product_id=? AND status = ? `
-	_, err = o.Raw(sql, companyId, productId, status).QueryRows(&items)
-	return
-}
-
 type PermissionCompany struct {
 	CompanyId int
 }
@@ -338,78 +291,6 @@ type PermissionAddTryOutReq struct {
 	ChartPermissionId string `description:"权限id,多个用英文逗号隔开"`
 }
 
-func FixPermissionStatus(companyId, productId int, startDate, endDate, status string) (err error) {
-	o := orm.NewOrm()
-	sql := `UPDATE company_report_permission SET start_date=?,end_date=?,status=?,modify_time=NOW() WHERE company_id=? AND product_id=? AND status IS NULL `
-	_, err = o.Raw(sql, startDate, endDate, status, companyId, productId).Exec()
-	return
-}
-
-func GetPermissionLookItemsExt(productId string, classifyName string) (items []*PermissionLookItem, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id IN(` + productId + `) AND classify_name=? ORDER BY sort ASC `
-	_, err = o.Raw(sql, classifyName).QueryRows(&items)
-	return
-}
-
-// 客户授权产品结构体（包含产品名称）
-type CompanyReportPermissionAndName struct {
-	CompanyReportPermissionId int `description:"客户授权产品id"`
-	CompanyId                 int
-	ReportPermissionId        int
-	CreatedTime               time.Time
-	LastUpdatedTime           time.Time
-	ChartPermissionId         int
-	StartDate                 string    `description:"权限开始日期"`
-	EndDate                   string    `description:"权限结束日期"`
-	ProductId                 int       `description:"产品id"`
-	ProductName               string    `description:"产品名称"`
-	CompanyContractId         int       `description:"合同id"`
-	PermissionName            string    `description:"客户授权产品的名称"`
-	ClassifyName              string    `description:"客户授权产品的分类名称"`
-	Status                    string    `description:"'正式','试用','关闭'"`
-	ModifyTime                time.Time `description:"修改时间"`
-}
-
-// 根据企业用户id字符串集合
-func GetCompanyReportPermissionListByCompanyIds(companyIds string) (items []*CompanyReportPermissionAndName, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT a.*,b.permission_name,b.classify_name FROM company_report_permission a left join chart_permission b on a.chart_permission_id=b.chart_permission_id WHERE a.company_id in (` + companyIds + `)`
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
-// 根据企业用户id和产品id获取所有正式的权限
-func GetCompanyReportPermissionListByProductId(companyId, productId int) (items []*CompanyReportPermissionAndName, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT a.*,b.permission_name,b.classify_name FROM company_report_permission a left join chart_permission b on a.chart_permission_id=b.chart_permission_id WHERE a.company_id = ? and a.product_id=? and a.status="正式"`
-	_, err = o.Raw(sql, companyId, productId).QueryRows(&items)
-	return
-}
-
-// GetChartPermissionListByIds 根据权限id集合获取所有的权限列表
-func GetChartPermissionListByIds(chartPermissionIds []int) (list []*ChartPermission, err error) {
-	o := orm.NewOrm()
-	//o.Using("rddp")
-	//sNums：=  make（[]，len（nums））
-	idStrList := make([]string, len(chartPermissionIds))
-	for key, id := range chartPermissionIds {
-		idStrList[key] = fmt.Sprint(id)
-	}
-	idStr := strings.Join(idStrList, ",")
-	sql := `SELECT * FROM chart_permission WHERE chart_permission_id in (` + idStr + `) `
-	_, err = o.Raw(sql).QueryRows(&list)
-	return
-}
-
-// 根据企业用户id和产品id获取所有正式的权限
-func GetCompanyProductReportPermissionList(companyId, productId int) (items []*CompanyReportPermissionAndName, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT a.*,b.permission_name,b.classify_name FROM company_report_permission a left join chart_permission b on a.chart_permission_id=b.chart_permission_id WHERE a.company_id = ? and a.product_id=? `
-	_, err = o.Raw(sql, companyId, productId).QueryRows(&items)
-	return
-}
-
 // GetChartPermissionListById 根据权限id获取产品权限详情
 func GetChartPermissionListById(chartPermissionId int) (item *ChartPermission, err error) {
 	o := orm.NewOrm()
@@ -452,174 +333,3 @@ func GetGroupNamesById(gid int) (items *string, err error) {
 	err = o.Raw(sql, gid).QueryRow(&items)
 	return
 }
-
-// GetChartPermissionFirst 获取排序后的权限分类
-func GetChartPermissionFirst() (list []*ChartPermissionFirst, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT classify_name FROM chart_permission_first ORDER BY yb_index_sort ASC `
-	_, err = o.Raw(sql).QueryRows(&list)
-	return
-}
-
-// GetCompanyReportPermissionUpgrade 获取升级的权限类型
-func GetCompanyReportPermissionUpgrade(companyId, productId int) (items []*CompanyReportPermission, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT
-	re.*
-FROM
-	company_report_permission  as re 
-	INNER JOIN chart_permission as  c ON c.chart_permission_id = re.chart_permission_id
-WHERE
-	re.company_id = ? 
-	AND re.product_id = ? 
-	AND re.is_upgrade = 1 
-	AND c.permission_type = 1
-	AND STATUS = '正式' `
-	_, err = o.Raw(sql, companyId, productId).QueryRows(&items)
-	return
-}
-
-// GetCompanyPermissionNameCheck 通过名称判断客户是否开了某一类型的权限
-func GetCompanyPermissionNameCheck(companyId, productId int, permissionName string) (count int, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT
-			COUNT( 1 ) AS count 
-		FROM
-			company_report_permission AS a 
-			INNER JOIN chart_permission as  c  ON c.chart_permission_id = a.chart_permission_id
-		WHERE
-			a.company_id = ?
-			AND a.STATUS = '正式'
-			AND a.product_id = ? 
-			AND c.chart_permission_name = ? `
-	err = o.Raw(sql, companyId, productId, permissionName).QueryRow(&count)
-	return
-}
-
-// GetCompanyReportPermissionUpgradeByChartPermissionId 通过行业权限获取具备该行业升级权限的公司
-func GetCompanyReportPermissionUpgradeByChartPermissionId(chartPermissionId int) (items []*CompanyReportPermission, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT
-	company_id 
-FROM
-	company_report_permission AS p 
-WHERE
-	1 = 1 
-	AND p.is_upgrade = 1 
-	AND p.chart_permission_id = ? 
-	AND p.STATUS = '正式' 
-	OR (
-		p.STATUS = '永续' 
-	AND p.chart_permission_id = ? 
-	)`
-	_, err = o.Raw(sql, chartPermissionId, chartPermissionId).QueryRows(&items)
-	return
-}
-
-func GetPermissionNameByPermissionIds(permissionIds []int) (names []string, err error) {
-	if len(permissionIds) == 0 {
-		return
-	}
-	o := orm.NewOrm()
-	sql := `SELECT
-				DISTINCT chart_permission_name
-			FROM
-				chart_permission
-			WHERE
-				chart_permission_id IN (` + utils.GetOrmInReplace(len(permissionIds)) + `)`
-	_, err = o.Raw(sql, permissionIds).QueryRows(&names)
-	return
-}
-
-func GetPermissionIdsByPermissionNames(names []string) (ids []int, err error) {
-	if len(names) == 0 {
-		return
-	}
-	o := orm.NewOrm()
-	sql := `SELECT
-				DISTINCT chart_permission_id
-			FROM
-				chart_permission
-			WHERE
-				chart_permission_name IN (` + utils.GetOrmInReplace(len(names)) + `)`
-	_, err = o.Raw(sql, names).QueryRows(&ids)
-	return
-}
-
-// GetCompanyIdsStrByReportPermissionIds 根据有效阅读权限IDs获取客户IDs
-func GetCompanyIdsStrByReportPermissionIds(permissionIds []int) (companyIds []int, err error) {
-	if len(permissionIds) == 0 {
-		return
-	}
-	o := orm.NewOrm()
-	sql := `SELECT
-				DISTINCT company_id
-			FROM
-				company_report_permission
-			WHERE
-				report_permission_id IN (` + utils.GetOrmInReplace(len(permissionIds)) + `) AND (DATE(NOW()) BETWEEN start_date AND end_date) AND status IN ('试用', '正式', '永续')`
-	_, err = o.Raw(sql, permissionIds).QueryRows(&companyIds)
-	return
-}
-
-// GetCompanyIdsStrByContractPermissionIds 根据合同权限IDs获取客户IDs
-func GetCompanyIdsStrByContractPermissionIds(permissionIds []int) (companyIds []int, err error) {
-	if len(permissionIds) == 0 {
-		return
-	}
-	o := orm.NewOrm()
-	sql := `SELECT
-				DISTINCT company_id
-			FROM
-				company_contract_permission
-			WHERE
-				chart_permission_id IN (` + utils.GetOrmInReplace(len(permissionIds)) + `) AND (DATE(NOW()) BETWEEN start_date AND end_date)`
-	_, err = o.Raw(sql, permissionIds).QueryRows(&companyIds)
-	return
-}
-
-// CompanyListPermissionIds 客户列表权限IDs
-type CompanyListPermissionIds struct {
-	CompanyId          int    `description:"客户ID"`
-	ChartPermissionIds string `description:"权限IDs"`
-}
-
-// GetContractPermissionIdsByCompanyIds 根据客户ID获取合同权限IDs
-func GetContractPermissionIdsByCompanyIds(companyIds []int) (items []*CompanyListPermissionIds, err error) {
-	if len(companyIds) == 0 {
-		return
-	}
-	o := orm.NewOrm()
-	sql := `SELECT
-				company_id,
-				GROUP_CONCAT(
-					DISTINCT chart_permission_id
-				) AS chart_permission_ids
-			FROM
-				company_contract_permission
-			WHERE
-				(DATE(NOW()) BETWEEN start_date AND end_date) AND company_id IN (` + utils.GetOrmInReplace(len(companyIds)) + `)`
-	sql += `GROUP BY company_id`
-	_, err = o.Raw(sql, companyIds).QueryRows(&items)
-	return
-}
-
-// GetReportPermissionIdsByCompanyIds 根据客户ID获取有效阅读权限IDs
-func GetReportPermissionIdsByCompanyIds(companyIds []int) (items []*CompanyListPermissionIds, err error) {
-	if len(companyIds) == 0 {
-		return
-	}
-	o := orm.NewOrm()
-	sql := `SELECT
-				company_id,
-				GROUP_CONCAT(
-					DISTINCT chart_permission_id
-				) AS chart_permission_ids
-			FROM
-				company_report_permission
-			WHERE
-				(DATE(NOW()) BETWEEN start_date AND end_date) AND status IN ('试用', '正式', '永续') AND company_id IN (` + utils.GetOrmInReplace(len(companyIds)) + `)`
-	sql += `GROUP BY company_id`
-	_, err = o.Raw(sql, companyIds).QueryRows(&items)
-	return
-}

models/data_manage/excel_info.go

@@ -3,7 +3,6 @@ package data_manage
 import (
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
-	"hongze/hz_eta_api/utils"
 	"time"
 )
 
@@ -229,31 +228,6 @@ func GetExcelInfoByClassifyIdAndName(classifyId int, excelName string) (item *Ex
 	return
 }
 
-// GetExcelInfoListByUniqueCodeSlice 根据表格编码获取表格列表数据
-func GetExcelInfoListByUniqueCodeSlice(uniqueCodeSlice []string) (total int64, items []*ExcelInfo, err error) {
-	num := len(uniqueCodeSlice)
-	if num <= 0 {
-		return
-	}
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT * FROM excel_info WHERE unique_code in ("` + utils.GetOrmInReplace(num) + `") AND is_delete=0 `
-	total, err = o.Raw(sql, uniqueCodeSlice).QueryRows(&items)
-	return
-}
-
-// GetExcelListByCondition 获取excel表格列表数据
-func GetExcelListByCondition(condition string, pars []interface{}, startSize, pageSize int) (item []*MyExcelInfoList, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT * FROM excel_info WHERE 1=1 AND is_delete=0 `
-	if condition != "" {
-		sql += condition
-	}
-	//sql += " ORDER BY sort ASC,chart_info_id DESC LIMIT ?,? "
-	sql += " ORDER BY create_time DESC LIMIT ?,? "
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&item)
-	return
-}
-
 // GetNoContentExcelListByCondition 获取没有content的excel表格列表数据
 func GetNoContentExcelListByCondition(condition string, pars []interface{}, startSize, pageSize int) (item []*MyExcelInfoList, err error) {
 	o := orm.NewOrmUsingDB("data")

services/company_permission.go

@@ -1,335 +0,0 @@
-package services
-
-import (
-	"errors"
-	"fmt"
-	"hongze/hz_eta_api/models"
-	"hongze/hz_eta_api/models/company"
-	"hongze/hz_eta_api/utils"
-	"strconv"
-	"strings"
-	"time"
-)
-
-// RaiCompanyPermissionAndCheckList
-// 权益客户-根据客户状态及所选产品线合并/拆分展示权限列表
-// 场景：查看客户权限、客户详情、编辑客户、增开试用
-// 非权益客户时, 返回权益权限列表, 但是checkList为空[]int
-// unify: 是否需要统一合并/拆分
-func RaiCompanyPermissionAndCheckList(companyId int, unify bool) (resp *company.PermissionLookList, err error) {
-	resp = new(company.PermissionLookList)
-	productId := utils.COMPANY_PRODUCT_RAI_ID
-	productName := utils.COMPANY_PRODUCT_RAI_NAME
-	checkList := make([]int, 0) // 客户拥有的权限, 用于前端匹配权限列表回显
-
-	// 获取权益权限列表
-	permissionItems, e := company.GetPermissionLookItems(productId, productName)
-	if e != nil {
-		err = errors.New("获取权益权限列表失败, Err: " + e.Error())
-		return
-	}
-	if len(permissionItems) == 0 {
-		err = errors.New("权益权限信息有误")
-		return
-	}
-
-	// 获取客户权益报告权限
-	reportPermissions, e := company.GetCompanyReportPermission(companyId, productId)
-	if e != nil {
-		err = errors.New("获取客户权益报告权限列表失败, Err: " + e.Error())
-		return
-	}
-	reportPermissionMap := make(map[int]*company.CompanyReportPermission, 0)
-	for i := range reportPermissions {
-		reportPermissionMap[reportPermissions[i].ChartPermissionId] = reportPermissions[i]
-	}
-
-	// 遍历权益权限, 赋予报告权限时长、状态等信息
-	subjectMap := make(map[string]*company.PermissionLookItem, 0)
-	objectMap := make(map[string]*company.PermissionLookItem, 0)
-	for i := range permissionItems {
-		v := permissionItems[i]
-		p := reportPermissionMap[v.ChartPermissionId]
-		if p != nil {
-			checkList = append(checkList, v.ChartPermissionId)
-			v.StartDate = p.StartDate
-			v.EndDate = p.EndDate
-			v.Status = p.Status
-			v.IsUpgrade = p.IsUpgrade
-			// 计算到期天数
-			endDateTime, _ := time.Parse(utils.FormatDate, v.EndDate)
-			endDateTime = endDateTime.AddDate(0, 0, 1)
-			sub := endDateTime.Sub(time.Now())
-			if sub < 0 {
-				sub = 0
-			}
-			expireDay := fmt.Sprintf("%v", int(sub.Hours()/24))
-			v.ExpireDay = expireDay
-
-			// 正式/永续-买方研选划分为3w和5w两种
-			if v.PermissionName == utils.CHART_PERMISSION_NAME_MF_YANXUAN && strings.Contains("正式,永续", v.Status) {
-				if p.ExpensiveYx == 1 {
-					v.PermissionName = fmt.Sprint(v.PermissionName, "(5w)")
-				} else {
-					v.PermissionName = fmt.Sprint(v.PermissionName, "(3w)")
-				}
-			}
-		}
-		if v.IsUpgrade == 1 && strings.Contains("正式,永续", v.Status) {
-			v.RaiBothHas = true
-			v.Remark = v.PermissionName
-			v.PermissionName += "(升级)"
-			v.PermissionType = 0
-			v.PermissionTypeName = ""
-			v.IsMerge = true
-		}
-		// 主客观
-		if v.PermissionType == 1 {
-			v.PermissionTypeName = "主观"
-			if v.StartDate != "" {
-				subjectMap[v.PermissionName] = v
-			}
-		}
-		if v.PermissionType == 2 {
-			v.PermissionTypeName = "客观"
-			if v.StartDate != "" {
-				objectMap[v.PermissionName] = v
-			}
-		}
-		// 默认都为合并, 后续再判断不合并的, 方便前端处理
-		if v.StartDate != "" {
-			v.IsMerge = true
-		}
-		v.ClassifyName = productName
-	}
-	// 二次遍历, 通过权限时长状态以及客户状态判断是否需要合并主客观
-	// 客户状态为试用且是在编辑时, 判断所有行业是否均为主客观都有, 都有的话且时长状态一致则均需要合并, 否则存在一个被拆出来展示的所有都要拆出来展示
-	disperse := false
-	for i := range permissionItems {
-		v := permissionItems[i]
-		if v.PermissionType == 0 || v.StartDate == "" {
-			continue
-		}
-		// 判断是否主客观都有
-		sub := subjectMap[v.PermissionName]
-		ob := objectMap[v.PermissionName]
-		if sub != nil && ob != nil {
-			v.RaiBothHas = true
-		}
-		// 判断是否需要合并
-		another := new(company.PermissionLookItem)
-		if v.PermissionType == 1 {
-			another = ob
-		} else {
-			another = sub
-		}
-		if another != nil {
-			if v.StartDate == another.StartDate && v.EndDate == another.EndDate && v.Status == another.Status {
-				v.IsMerge = true
-			} else {
-				v.IsMerge = false
-			}
-		} else {
-			v.IsMerge = false
-		}
-		// 是否需要全部拆分
-		if unify && !v.IsMerge {
-			disperse = true
-		}
-	}
-	// 全部合并/拆分(正式客户增开试用/试用客户编辑使用)
-	if unify {
-		if disperse {
-			resp.RaiMerge = 2
-		} else {
-			if len(subjectMap) == len(objectMap) {
-				resp.RaiMerge = 1
-			}
-		}
-	}
-	//有升级权限时只展示一个
-	newpPermissionItems := make([]*company.PermissionLookItem, 0)
-	upgradeMap := make(map[string]int)
-	for _, v := range permissionItems {
-		if _, ok := upgradeMap[v.PermissionName]; !ok {
-			newpPermissionItems = append(newpPermissionItems, v)
-			if strings.Contains(v.PermissionName, "升级") {
-				upgradeMap[v.PermissionName] = v.ChartPermissionId
-			}
-		}
-	}
-	resp.Items = newpPermissionItems
-	resp.CheckList = checkList
-	resp.ClassifyName = productName
-	return
-}
-
-// 处理哪些权选择了升级
-func PermissionIdUpgrade(permissionNames string) (mapPermissionIdUpgrade map[int]int, err error) {
-	permissionArr := strings.Split(permissionNames, ",")
-	if len(permissionArr) == 0 {
-		return
-	}
-	var permissionNameUpgrade []string
-	for _, v := range permissionArr {
-		if strings.Contains(v, "升级") {
-			permissionNameUpgrade = append(permissionNameUpgrade, "'"+strings.Replace(v, "(升级)", "", -1)+"'")
-		}
-	}
-	if len(permissionNameUpgrade) == 0 {
-		return
-	}
-	chartList, e := models.GetChartPermissionByNames(permissionNameUpgrade)
-	if e != nil {
-		err = errors.New("GetChartPermissionByNames 获取品种信息失败, Err:" + e.Error())
-		return
-	}
-	mapPermissionId := make(map[int]int)
-	for _, v := range chartList {
-		mapPermissionId[v.ChartPermissionId] = v.ChartPermissionId
-	}
-	mapPermissionIdUpgrade = mapPermissionId
-	return
-}
-
-// 处理申请服务更新的权益客户的升级权限，主客观权限的修改
-func CheckCompanyUpgrade(permissionIds string) (permissionIdsNew string, mapPermissionIdUpgrade map[int]int, err error) {
-	//给升级的产业ID加一个极大值判断处理
-	mapPermissionIdUpgrade = make(map[int]int)
-	var permissionSliceNew []int
-	permissionSlice := strings.Split(permissionIds, ",")
-	mapPermissionId := make(map[int]int)
-	//var permissionIdsNew string //新的权限id x
-	var permissionIdsUpgrade string   //升级的权限ID
-	var permissionIdsNoUpgrade string // 没有升级的权限ID
-	var permissionIdOnly int          //处理普通权限与升级权限同时勾选的时候的拦截
-	for _, v := range permissionSlice {
-		permissionId, _ := strconv.Atoi(v)
-		if permissionId > utils.PERMISSION_ID_UPGRADE {
-			permissionIdsUpgrade += strconv.Itoa(permissionId-utils.PERMISSION_ID_UPGRADE) + ","
-			permissionIdOnly = permissionId - utils.PERMISSION_ID_UPGRADE
-		} else {
-			permissionIdsNoUpgrade += strconv.Itoa(permissionId) + ","
-			permissionIdOnly = permissionId
-		}
-		if _, ok := mapPermissionId[permissionIdOnly]; ok {
-			err = errors.New("升级权限与普通权限重复选择！" + permissionIds)
-			return
-		}
-		mapPermissionId[permissionIdOnly] = permissionIdOnly
-	}
-	if permissionIdsUpgrade != "" {
-		permissionIdsUpgrade = strings.TrimRight(permissionIdsUpgrade, ",")
-		permissionStrUpgrade, e := company.GetPermissionIdById(permissionIdsUpgrade)
-		if e != nil {
-			err = errors.New("获取升级主观客观权限信息失败！" + e.Error())
-			return
-		}
-		permissionSliceUpgrade := strings.Split(permissionStrUpgrade, ",")
-		for _, v := range permissionSliceUpgrade {
-			permissionId, _ := strconv.Atoi(v)
-			mapPermissionIdUpgrade[permissionId] = 1
-			permissionSliceNew = append(permissionSliceNew, permissionId)
-		}
-	}
-
-	if permissionIdsNoUpgrade != "" {
-		permissionIdsNoUpgrade = strings.TrimRight(permissionIdsNoUpgrade, ",")
-		permissionStrNoUpgrade, e := company.GetPermissionIdById(permissionIdsNoUpgrade)
-		if e != nil {
-			err = errors.New("获取主观客观权限信息失败！" + e.Error())
-			return
-		}
-		permissionSliceNoUpgrade := strings.Split(permissionStrNoUpgrade, ",")
-		for _, v := range permissionSliceNoUpgrade {
-			permissionId, _ := strconv.Atoi(v)
-			permissionSliceNew = append(permissionSliceNew, permissionId)
-		}
-	}
-	for _, v := range permissionSliceNew {
-		permissionIdsNew += strconv.Itoa(v) + ","
-	}
-	permissionIdsNew = strings.TrimRight(permissionIdsNew, ",")
-	return
-}
-
-// CheckCompanyUpgradeV2 处理申请服务更新的权益客户的升级权限，主客观权限的修改
-func CheckCompanyUpgradeV2(strPermissionIds string, isRai bool) (newPermissions string, upgradeMap map[int]int, expensiveMap map[int]int, err error) {
-	upgradeMap = make(map[int]int)
-	expensiveMap = make(map[int]int)
-	permissionArr := strings.Split(strPermissionIds, ",")
-	if len(permissionArr) == 0 {
-		return
-	}
-
-	// 非内部人员获取主观对应的客观权限
-	subObjMap := make(map[int]int, 0)
-	if !isRai {
-		m, e := GetRaiSubObjPermissionIdMap()
-		if e != nil {
-			err = fmt.Errorf("GetRaiSubObjPermissionIdMap Err: %s", e.Error())
-			return
-		}
-		subObjMap = m
-	}
-
-	existsId := make(map[int]bool) // 升级权限与普通权限冲突
-	newPermissionArr := make([]string, 0)
-	for _, v := range permissionArr {
-		p, _ := strconv.Atoi(v)
-		if existsId[p] {
-			continue
-		}
-		// 升级权限
-		if p > utils.PERMISSION_ID_UPGRADE {
-			o := p - utils.PERMISSION_ID_UPGRADE
-			upgradeMap[o] = 1
-			existsId[o] = true
-			newPermissionArr = append(newPermissionArr, strconv.Itoa(o))
-			continue
-		}
-		// 买方研选5w
-		if p > utils.PERMISSION_ID_YANXUAN_DIFF {
-			o := p - utils.PERMISSION_ID_YANXUAN_DIFF
-			expensiveMap[o] = 1
-			existsId[o] = true
-			newPermissionArr = append(newPermissionArr, strconv.Itoa(o))
-			continue
-		}
-		// 非升级权限
-		existsId[p] = true
-		newPermissionArr = append(newPermissionArr, strconv.Itoa(p))
-		// 非内部人员选择主观时需要加上客观的权限
-		if !isRai && subObjMap[p] > 0 {
-			newPermissionArr = append(newPermissionArr, strconv.Itoa(subObjMap[p]))
-		}
-	}
-	newPermissions = strings.Join(newPermissionArr, ",")
-	return
-}
-
-// GetRaiSubObjPermissionIdMap 获取权益行业主观权限对应的客观权限
-func GetRaiSubObjPermissionIdMap() (permissionMap map[int]int, err error) {
-	permissionMap = make(map[int]int, 0)
-	permissions, e := models.GetChartPermissionList()
-	if e != nil {
-		err = fmt.Errorf("GetChartPermissionList, Err: %s", e.Error())
-		return
-	}
-	subMap, objMap := make(map[string]int), make(map[string]int)
-	for _, v := range permissions {
-		if !strings.Contains("医药消费科技智造", v.PermissionName) {
-			continue
-		}
-		if strings.Contains(v.Remark, "主观") {
-			subMap[v.PermissionName] = v.ChartPermissionId
-			continue
-		}
-		objMap[v.PermissionName] = v.ChartPermissionId
-	}
-	nameArr := []string{utils.YI_YAO_NAME, utils.XIAO_FEI_NAME, utils.KE_JI_NAME, utils.ZHI_ZAO_NAME}
-	for _, n := range nameArr {
-		permissionMap[subMap[n]] = objMap[n]
-	}
-	return
-}