|
@@ -294,9 +294,14 @@ func CheckUserChartPermission(companyId int64, userId int) (ok bool, permissionC
|
|
|
if ok == false && permissionCheckInfo.Type == "apply" {
|
|
|
_, err = yb_apply_record.GetLastNotOpRecordByUserId(userId, 3) // 图库申请
|
|
|
// 查询是否有申请过,如果有申请过的话,那么err是nil
|
|
|
- if err == nil {
|
|
|
- permissionCheckInfo.CustomerInfo.HasApply = true
|
|
|
+ if err != nil {
|
|
|
+ if err == utils.ErrNoRow {
|
|
|
+ err = nil
|
|
|
+ return
|
|
|
+ }
|
|
|
+ return
|
|
|
}
|
|
|
+ permissionCheckInfo.CustomerInfo.HasApply = true
|
|
|
}
|
|
|
}()
|
|
|
|
|
@@ -358,11 +363,7 @@ func CheckUserChartPermission(companyId int64, userId int) (ok bool, permissionC
|
|
|
// 客户状态为冻结/试用暂停-联系销售
|
|
|
permissionCheckInfo.Name = adminInfo.RealName
|
|
|
permissionCheckInfo.Mobile = adminInfo.Mobile
|
|
|
- if companyProductInfo.Status == "冻结" {
|
|
|
- permissionCheckInfo.Type = "contact"
|
|
|
- return
|
|
|
- }
|
|
|
- if companyProductInfo.Status == "试用" && companyProductInfo.IsSuspend == 1 {
|
|
|
+ if companyProductInfo.Status == "冻结" || (companyProductInfo.Status == "试用" && companyProductInfo.IsSuspend == 1) {
|
|
|
permissionCheckInfo.Type = "contact"
|
|
|
return
|
|
|
}
|