fix: 申请记录

controller/user/user.go

@@ -8,7 +8,6 @@ import (
 	userResp "hongze/hongze_yb/models/response/user"
 	userService "hongze/hongze_yb/services/user"
 	"hongze/hongze_yb/utils"
-	"strconv"
 	"strings"
 )
 
@@ -194,13 +193,7 @@ func Info(c *gin.Context) {
 // @Router /user/get_last_apply_record [get]
 func GetLastApplyRecord(c *gin.Context) {
 	userInfo := userService.GetInfoByClaims(c)
-	reqSource := c.DefaultQuery("source", "0")
-	if reqSource == "0" {
-		response.Fail("获取失败，申请来源有误", c)
-		return
-	}
-	source, _ := strconv.Atoi(reqSource)
-	record, err := userLogic.GetLastApplyInfo(int(userInfo.UserID), source)
+	record, err := userLogic.GetLastApplyInfo(int(userInfo.UserID))
 
 	if err != nil {
 		response.Fail("获取失败", c)

logic/user/user.go

@@ -230,8 +230,8 @@ type Record struct {
 }
 
 // GetLastApplyInfo 获取最近的一套申请记录
-func GetLastApplyInfo(userId, source int) (record Record, err error) {
-	recordInfo, err := yb_apply_record.GetLastNotOpRecordByUserId(userId, source)
+func GetLastApplyInfo(userId int) (record Record, err error) {
+	recordInfo, err := yb_apply_record.GetLastNotOpRecordByUserId(userId)
 	if err != nil {
 		if err == utils.ErrNoRow {
 			err = nil
@@ -253,7 +253,7 @@ func Apply(userId int, companyId int64, mobile, email string, applyInfo userReq.
 	status := `潜在用户`
 	companyName := applyInfo.CompanyName
 
-	tmpmYbApplyRecord, err := yb_apply_record.GetLastNotOpRecordByUserId(userId, applyInfo.Source)
+	tmpmYbApplyRecord, err := yb_apply_record.GetLastNotOpRecordByUserId(userId)
 	if err == nil {
 		ybApplyRecord = tmpmYbApplyRecord	// 申请来源每一种只存在一条数据
 		return

models/tables/yb_apply_record/query.go

@@ -24,13 +24,7 @@ func GetByRecordId(recordId int) (item *YbApplyRecord, err error) {
 }
 
 // GetLastNotOpRecordByUserId 根据用户id获取最近的一条未被操作过的申请记录信息
-func GetLastNotOpRecordByUserId(userId, source int) (item *YbApplyRecord, err error) {
-	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
+func GetLastNotOpRecordByUserId(userId int) (item *YbApplyRecord, err error) {
+	err = global.DEFAULT_MYSQL.Where("user_id = ? AND op_status = 0", userId).Order("apply_record_id desc").First(&item).Error
 	return
 }

services/company/permission.go

@@ -130,7 +130,7 @@ func CheckPermissionByPermissionIdList2Ficc(companyId int64, userId int, permiss
 			ok, _ = checkPermissionByPermissionIdList2Rai(companyId, permissionIdList)
 		}
 		if ok == false && permissionCheckInfo.Type == "apply" {
-			_, err = yb_apply_record.GetLastNotOpMineOrActivityRecord(userId)	// 从来源我的/活动申请的记录
+			_, err = yb_apply_record.GetLastNotOpRecordByUserId(userId)	// 从来源我的/活动申请的记录
 			if err != nil && err != utils.ErrNoRow {
 				return
 			}
@@ -295,7 +295,7 @@ func CheckUserChartPermission(companyId int64, userId int) (ok bool, permissionC
 	defer func() {
 		// 如果无权限，那么就去查询是否申请过
 		if ok == false && permissionCheckInfo.Type == "apply" {
-			_, err = yb_apply_record.GetLastNotOpRecordByUserId(userId, 3)	// 图库申请
+			_, err = yb_apply_record.GetLastNotOpRecordByUserId(userId)	// 图库申请
 			// 查询是否有申请过，如果有申请过的话，那么err是nil
 			if err != nil {
 				if err == utils.ErrNoRow {