Merge branch 'fix_needs_0323' of hongze/hongze_yb into master

models/tables/admin/query.go

@@ -12,6 +12,6 @@ func GetByAdminId(adminId int) (item *Admin, err error) {
 
 // GetAdminByMobile 通过手机号获取系统用户信息
 func GetAdminByMobile(mobile string) (item *Admin, err error) {
-	err = global.DEFAULT_MYSQL.Model(Admin{}).Where("mobile = ?", mobile).First(&item).Error
+	err = global.DEFAULT_MYSQL.Model(Admin{}).Where("mobile = ? AND enabled = 1", mobile).First(&item).Error
 	return
 }

services/company/permission.go

@@ -127,7 +127,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)	// 从来源我的/活动申请的记录
@@ -172,6 +172,14 @@ func CheckPermissionByPermissionIdList2Ficc(companyId int64, userId int, permiss
 			return
 		}
 
+		// 查询用户是否为弘则研究已禁用的联系人
+		if companyId == 16 {
+			if wxUser.Enabled != 1 {
+				permissionCheckInfo.Type = "apply"
+				return
+			}
+		}
+
 		//客户信息
 		companyInfo, tmpErr := company.GetByCompanyId(companyId)
 		if tmpErr != nil {
@@ -242,13 +250,25 @@ func CheckPermissionByPermissionIdList2Ficc(companyId int64, userId int, permiss
 }
 
 // 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
@@ -330,6 +350,14 @@ func CheckUserChartPermission(companyId int64, userId int) (ok bool, permissionC
 			return
 		}
 
+		// 查询用户是否为弘则研究已禁用的联系人
+		if companyId == 16 {
+			if wxUser.Enabled != 1 {
+				permissionCheckInfo.Type = "apply"
+				return
+			}
+		}
+
 		// 客户信息
 		companyInfo, tmpErr := company.GetByCompanyId(companyId)
 		if tmpErr != nil {