fix: 申请记录

controller/user/user.go

@@ -196,7 +196,8 @@ func GetLastApplyRecord(c *gin.Context) {
 	userInfo := userService.GetInfoByClaims(c)
 	reqSource := c.DefaultQuery("source", "0")
 	if reqSource == "0" {
-		reqSource = "1"
+		response.Fail("获取失败，申请来源有误", c)
+		return
 	}
 	source, _ := strconv.Atoi(reqSource)
 	record, err := userLogic.GetLastApplyInfo(int(userInfo.UserID), source)

models/tables/yb_apply_record/query.go

@@ -28,3 +28,9 @@ func GetLastNotOpRecordByUserId(userId, source int) (item *YbApplyRecord, err er
 	err = global.DEFAULT_MYSQL.Where("user_id = ? AND source = ? and op_status = 0", userId, source).Order("apply_record_id desc").First(&item).Error
 	return
 }
+
+// GetLastNotOpMineOrActivityRecord 获取最近的一条未被操作过的我的/活动申请记录
+func GetLastNotOpMineOrActivityRecord(userId int) (item *YbApplyRecord, err error) {
+	err = global.DEFAULT_MYSQL.Where("user_id = ? AND (source = 1 OR source = 2) AND op_status = 0", userId).Order("apply_record_id desc").First(&item).Error
+	return
+}

services/company/permission.go

@@ -130,7 +130,10 @@ func CheckPermissionByPermissionIdList2Ficc(companyId int64, userId int, permiss
 			ok, _ = checkPermissionByPermissionIdList2Rai(companyId, permissionIdList)
 		}
 		if ok == false && permissionCheckInfo.Type == "apply" {
-			_, err = yb_apply_record.GetLastNotOpRecordByUserId(userId, 2)	// 活动申请
+			_, err = yb_apply_record.GetLastNotOpMineOrActivityRecord(userId)	// 从来源我的/活动申请的记录
+			if err != nil && err != utils.ErrNoRow {
+				return
+			}
 			//查询是否有申请过，如果有申请过的话，那么err是nil
 			if err == nil {
 				permissionCheckInfo.CustomerInfo.HasApply = true