Merge branch 'hotfix/v4.9.20.1_ws' of qmx/jy into hotfix/v4.9.20.1

src/jfw/modules/publicapply/src/detail/util/util.go

@@ -167,17 +167,19 @@ func BiddingIdHandle(href string) (id, pageType string) {
 			href = strings.Split(hrefPage, "link=")[1]
 		}
 	}
-	if !strings.Contains(href, "=") {
-		_href, err := url.QueryUnescape(href)
-		if err == nil {
-			href = _href
-		}
-	}
 	if matches := regArt.FindStringSubmatch(href); len(matches) > 3 {
 		pageType = matches[2]
-		ids := encrypt.CommonDecodeArticle(pageType, matches[3])
-		if len(ids) > 0 {
-			id = ids[0]
+		if encryptionId := matches[3]; encryptionId != "" {
+			if !strings.Contains(encryptionId, "=") {
+				_encryptionId, err := url.QueryUnescape(encryptionId)
+				if err == nil {
+					encryptionId = _encryptionId
+				}
+			}
+			ids := encrypt.CommonDecodeArticle(pageType, encryptionId)
+			if len(ids) > 0 {
+				id = ids[0]
+			}
 		}
 	}
 	return