Merge branch 'dev/4.9.36_fu' of qmx/jy into feature/v4.9.36

src/jfw/modules/subscribepay/src/entity/dataexport.go

@@ -809,16 +809,27 @@ func GetDataExportMailContent(orderCode string) (content string, err error) {
 		if region == "" {
 			region = "全国"
 		}
-		var industryBuffer bytes.Buffer
-		for k, v := range sc.Industry {
-			if k > 0 {
+		var (
+			industryBuffer bytes.Buffer
+			ii             int
+		)
+		for _, v := range sc.Industry {
+			if ii > 0 {
 				industryBuffer.WriteString(" ")
 			}
+			if strings.Contains(v, "其它") {
+				continue
+			}
+			ii++
 			vs := strings.Split(v, "_")
 			if len(vs) == 1 {
 				industryBuffer.WriteString(vs[0])
 			} else {
-				industryBuffer.WriteString(vs[1])
+				if vs[1] == "其他" {
+					industryBuffer.WriteString(v)
+				} else {
+					industryBuffer.WriteString(vs[1])
+				}
 			}
 		}
 		if len(sc.Industry) > 0 {