校验用户禁用启用

services/company/permission.go

@@ -149,7 +149,7 @@ func CheckPermissionByPermissionIdList2Ficc(companyId int64, userId int, permiss
 	defer func() {
 		// 如果无权限，那么就去查询是否申请过
 		if ok == false {
-			ok, _ = checkPermissionByPermissionIdList2Rai(companyId, permissionIdList)
+			ok, _ = checkPermissionByPermissionIdList2Rai(companyId, userId, permissionIdList)
 		}
 		if ok == false && permissionCheckInfo.Type == "apply" {
 			_, err = yb_apply_record.GetLastNotOpRecordByUserId(userId)	// 从来源我的/活动申请的记录
@@ -267,7 +267,7 @@ func GetCheckPermission(companyId int64, userId int, permissionIdList []int) (ok
 	defer func() {
 		// 如果无权限，那么就去查询是否申请过
 		if ok == false {
-			ok, _ = checkPermissionByPermissionIdList2Rai(companyId, permissionIdList)
+			ok, _ = checkPermissionByPermissionIdList2Rai(companyId, userId, permissionIdList)
 		}
 		if ok == false && permissionCheckInfo.Type == "apply" {
 			_, err = yb_apply_record.GetLastNotOpRecordByUserId(userId)	// 从来源我的/活动申请的记录
@@ -386,13 +386,25 @@ func GetCheckPermission(companyId int64, userId int, permissionIdList []int) (ok
 }
 
 // checkPermissionByPermissionIdList2Rai 根据权限id集合权限校验（权益）
-func checkPermissionByPermissionIdList2Rai(companyId int64, permissionIdList []int) (ok bool, err error) {
+func checkPermissionByPermissionIdList2Rai(companyId int64, userId int, permissionIdList []int) (ok bool, err error) {
 	//非潜在客户
 	if len(permissionIdList) <= 0 {
 		err = fmt.Errorf("权限异常，请传入需要校验的权限")
 		return
 	}
 
+	// 查询用户是否为弘则研究已禁用的联系人
+	wxUser, tmpErr := wx_user.GetByUserId(userId)
+	if tmpErr != nil {
+		err = fmt.Errorf("用户信息异常")
+		return
+	}
+	if companyId == 16 {
+		if wxUser.Enabled != 1 {
+			return
+		}
+	}
+
 	//市场策略（ficc权限id）：33
 	ficcPermissionId := 33
 	//市场策略（权益权限id）：23