|
@@ -79,7 +79,9 @@ func RaiCompanyPermissionAndCheckList(companyId int, unify bool) (resp *company.
|
|
v.RaiBothHas = true
|
|
v.RaiBothHas = true
|
|
v.Remark = v.PermissionName
|
|
v.Remark = v.PermissionName
|
|
v.PermissionName += "(升级)"
|
|
v.PermissionName += "(升级)"
|
|
- v.PermissionType = 0
|
|
|
|
|
|
+ if !unify {
|
|
|
|
+ v.PermissionType = 0
|
|
|
|
+ }
|
|
v.PermissionTypeName = ""
|
|
v.PermissionTypeName = ""
|
|
v.IsMerge = true
|
|
v.IsMerge = true
|
|
}
|
|
}
|