Merge branch 'dev/v4.8.59_dx' of qmx/jy into feature/v4.8.59

src/jfw/modules/bigmember/src/entity/portraitWinnerSearch.go

@@ -138,7 +138,7 @@ func GetContacts(entName string, entType int) (list []interface{}) {
                     FROM
                         dws_f_ent_contact a
                     LEFT JOIN dws_f_bpmc_relation b ON (a.id = b.contact_id )
-                    WHERE a.name_id = ? AND a.contact_tel is not null AND a.contact_tel <> '' AND a.contact_tel REGEXP '^[0-9]+$'  AND (if(a.source_type=2,true,(a.identity_type &(1 << ?)) > 0 ))) m
+                    WHERE a.name_id = ? AND a.contact_tel is not null AND a.contact_tel <> '' AND a.contact_tel REGEXP '^[0-9-]+$'  AND (if(a.source_type=2,true,(a.identity_type &(1 << ?)) > 0 ))) m
                     LEFT JOIN dws_f_bid_baseinfo n ON m.infoid = n.infoid
                     where (if(m.source_type=1,projectname is not null AND projectname != "",true)) order by publishtime desc;`
 	rsContact := db.MysqlGloabl.SelectBySql(queryContacts, nameId, entType)

src/jfw/modules/bigmember/src/service/portrait/memberPortraitAction.go

@@ -438,7 +438,9 @@ func (this *EntPortrait) BuyerPortrait() {
 		if err != nil {
 			return nil, err
 		}
-		rData["name"] = entName
+		if rData != nil {
+			rData["name"] = entName
+		}
 		return rData, nil
 	}()
 	if errMsg != nil {

src/jfw/modules/bigmember/src/service/portrait/subvipPortraitAction.go

@@ -515,10 +515,12 @@ func (this *SubVipPortrait) BuyerPortrait() {
 		if err != nil {
 			return nil, err
 		}
-		if power == 3 {
-			rData["onTrial"] = true
+		if rData != nil {
+			if power == 3 {
+				rData["onTrial"] = true
+			}
+			rData["name"] = buyerName
 		}
-		rData["name"] = buyerName
 		return rData, nil
 	}()
 	if errMsg != nil {