Merge branch 'hotfix/v4.9.33.4' into master

src/jfw/modules/subscribepay/src/service/dataexportPack.go

@@ -71,15 +71,17 @@ func (des *DataExportPack) ScreenList() {
 				dataMap["city"] = strings.Join(qutil.ObjArrToStringArr(city), ",")
 				region, _ := dataMap["region"].([]interface{})
 				dataMap["region"] = strings.Join(qutil.ObjArrToStringArr(region), ",")
-				var industry []string
-				if industrys := qutil.ObjArrToStringArr(dataMap["industry"].([]interface{})); len(industrys) > 0 {
-					for _, v := range industrys {
-						if !strings.Contains(v, "其它") {
-							industry = append(industry, v)
+				var industry = []string{}
+				if dataMap["industry"] != nil {
+					if industrys := qutil.ObjArrToStringArr(dataMap["industry"].([]interface{})); len(industrys) > 0 {
+						for _, v := range industrys {
+							if !strings.Contains(v, "其它") {
+								industry = append(industry, v)
+							}
 						}
 					}
 				}
-				dataMap["industry"] = strings.Join(industry, ",")
+				dataMap["industry"] = qutil.If(len(industry) > 0, strings.Join(industry, ","), "").(string)
 				buyerclass, _ := dataMap["buyerclass"].([]interface{})
 				dataMap["buyerclass"] = strings.Join(qutil.ObjArrToStringArr(buyerclass), ",")
 				buyer, _ := dataMap["buyer"].([]interface{})