Merge branch 'xjjdev' into dev

cmd/internal/dao/artistInfo_user.go

@@ -666,6 +666,9 @@ func GetViewUserList(req *artistInfoUser.FindUsersRequest) (resp []model.UserVie
 	if req.IsArtist {
 		tx = tx.Where("mgmt_artist_uid !='' ")
 	}
+	if req.ArtistRealName != "" {
+		tx = tx.Where(fmt.Sprintf("real_name LIKE '%%%s%%'", req.ArtistRealName))
+	}
 	if req.Keyword != "" {
 		searchWords := "%" + req.Keyword + "%"
 		tx = tx.Where("real_name LIKE ? OR invited_code LIKE ? OR tel_num LIKE ?", searchWords, searchWords, searchWords)

cmd/internal/logic/artistinfo_artwork.go

@@ -10,6 +10,8 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"strings"
+
 	"github.com/fonchain/fonchain-artistinfo/cmd/internal/dao"
 	"github.com/fonchain/fonchain-artistinfo/cmd/model"
 	"github.com/fonchain/fonchain-artistinfo/pb/artist"
@@ -20,7 +22,6 @@ import (
 	"github.com/fonchain/fonchain-artistinfo/pkg/service"
 	"github.com/fonchain/fonchain-artistinfo/pkg/util/stime"
 	"google.golang.org/protobuf/types/known/emptypb"
-	"strings"
 )
 
 type IArtistInfoArtwork interface {
@@ -211,10 +212,11 @@ func (a ArtistInfoArtworkLogic) GenerateArtworkSupplementInfo(request *artistInf
 func (a ArtistInfoArtworkLogic) ArtworkStatic(request *artistInfoArtwork.ArtistArtworkStaticRequest) (res *artistInfoArtwork.ArtistArtworkStaticResponse, err error) {
 	//查询画家宝中认证成功的用户
 	userList, _, err := dao.GetViewUserList(&artistInfoUser.FindUsersRequest{
-		ArtistRealName: request.ArtistKeyWords,
-		Page:           int32(request.Page),
-		PageSize:       int32(request.PageSize),
-		IsArtist:       true,
+		// ArtistRealName: request.ArtistKeyWords,
+		Keyword:  request.ArtistKeyWords,
+		Page:     int32(request.Page),
+		PageSize: int32(request.PageSize),
+		IsArtist: true,
 	})
 	if err != nil {
 		return nil, err