|
|
@@ -449,21 +449,21 @@ func (this *CompanyApplyController) ApplyTurnPositive() {
|
|
|
req.PermissionIds = strings.TrimRight(permissionIdsNew, ",")
|
|
|
|
|
|
// 是否为权益内部人员, 非权益内部人员只能勾选行业不能勾选单独的主客观, 需要通过主观的ID去查客观的ID
|
|
|
- isRai, e := services.CheckRaiAdmin(sysUser.AdminId)
|
|
|
- if e != nil {
|
|
|
- br.Msg = "获取失败"
|
|
|
- br.ErrMsg = "判断是否为权益内部人员失败, GetRaiAdmin Err: " + e.Error()
|
|
|
+ //isRai, e := services.CheckRaiAdmin(sysUser.AdminId)
|
|
|
+ //if e != nil {
|
|
|
+ // br.Msg = "获取失败"
|
|
|
+ // br.ErrMsg = "判断是否为权益内部人员失败, GetRaiAdmin Err: " + e.Error()
|
|
|
+ // return
|
|
|
+ //}
|
|
|
+ //if !isRai {
|
|
|
+ permissionStr, err := company.GetPermissionIdById(req.PermissionIds)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "获取信息失败"
|
|
|
+ br.ErrMsg = "获取主观客观权限信息失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
- if !isRai {
|
|
|
- permissionStr, err := company.GetPermissionIdById(req.PermissionIds)
|
|
|
- if err != nil {
|
|
|
- br.Msg = "获取信息失败"
|
|
|
- br.ErrMsg = "获取主观客观权限信息失败,Err:" + err.Error()
|
|
|
- return
|
|
|
- }
|
|
|
- req.PermissionIds = permissionStr
|
|
|
- }
|
|
|
+ req.PermissionIds = permissionStr
|
|
|
+ //}
|
|
|
|
|
|
// 升级map
|
|
|
if permissionNames != "" {
|
ziwen