|
@@ -1611,7 +1611,7 @@ func (this *ContractController) Detail() {
|
|
|
if isNeedPermission {
|
|
|
checkPermissionMap, tErr := contractService.GetServicePermissionMap(contractInfo.Service)
|
|
|
if tErr == nil {
|
|
|
- permissionLookListMap := make(map[string][]*contract.PermissionLookItem)
|
|
|
+ permissionLookListMap := make(map[int][]*contract.PermissionLookItem)
|
|
|
var permissionIds []string
|
|
|
for _, v := range checkPermissionMap {
|
|
|
permissionIds = append(permissionIds, strconv.Itoa(v))
|
|
@@ -1624,12 +1624,12 @@ func (this *ContractController) Detail() {
|
|
|
tmp.ClassifyName = v.ClassifyName
|
|
|
tmp.PermissionName = v.PermissionName
|
|
|
tmp.ChartPermissionId = v.ChartPermissionId
|
|
|
- permissionLookListMap[v.ClassifyName] = append(permissionLookListMap[v.ClassifyName], tmp)
|
|
|
+ permissionLookListMap[v.ParentId] = append(permissionLookListMap[v.ParentId], tmp)
|
|
|
}
|
|
|
classifyNameList, tErr2 := company.GetChartPermissionFirst()
|
|
|
if tErr2 == nil {
|
|
|
for _, v := range classifyNameList {
|
|
|
- if perList, ok := permissionLookListMap[v.ClassifyName]; ok {
|
|
|
+ if perList, ok := permissionLookListMap[v.ChartPermissionId]; ok {
|
|
|
permissionLookListRespItem := &contract.PermissionLookList{
|
|
|
ClassifyName: v.ClassifyName,
|
|
|
Items: perList,
|
|
@@ -2998,7 +2998,7 @@ func (this *ContractController) DetailMerge() {
|
|
|
if isNeedPermission {
|
|
|
checkPermissionMap, tErr := contractService.GetServicePermissionMap(contractInfo.Service)
|
|
|
if tErr == nil {
|
|
|
- permissionLookListMap := make(map[string][]*contract.PermissionLookItem)
|
|
|
+ permissionLookListMap := make(map[int][]*contract.PermissionLookItem)
|
|
|
var permissionIds []string
|
|
|
for _, v := range checkPermissionMap {
|
|
|
permissionIds = append(permissionIds, strconv.Itoa(v))
|
|
@@ -3011,12 +3011,12 @@ func (this *ContractController) DetailMerge() {
|
|
|
tmp.ClassifyName = v.ClassifyName
|
|
|
tmp.PermissionName = v.PermissionName
|
|
|
tmp.ChartPermissionId = v.ChartPermissionId
|
|
|
- permissionLookListMap[v.ClassifyName] = append(permissionLookListMap[v.ClassifyName], tmp)
|
|
|
+ permissionLookListMap[v.ParentId] = append(permissionLookListMap[v.ParentId], tmp)
|
|
|
}
|
|
|
classifyNameList, tErr2 := company.GetChartPermissionFirst()
|
|
|
if tErr2 == nil {
|
|
|
for _, v := range classifyNameList {
|
|
|
- if perList, ok := permissionLookListMap[v.ClassifyName]; ok {
|
|
|
+ if perList, ok := permissionLookListMap[v.ChartPermissionId]; ok {
|
|
|
permissionLookListRespItem := &contract.PermissionLookList{
|
|
|
ClassifyName: v.ClassifyName,
|
|
|
Items: perList,
|