fix: GetUser

internal/logic/getuserlogic.go

@@ -28,15 +28,15 @@ func NewGetUserLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetUserLo
 func (l *GetUserLogic) GetUser(in *transform.UserRequest) (*transform.UserResponse, error) {
 	tfr, user := transform.UserResponse{}, &model.SysUser{}
 	var err error
-	if in.Id != "" {
+	if in.Id != "" && in.Id != "0" {
 		user, err = l.svcCtx.SysUserModel.FindOne(in.Id)
 		if err != nil && err != sqlc.ErrNotFound {
-			return nil, err
+			return &tfr, nil
 		}
 	} else if in.Phone != "" {
 		user, err = l.svcCtx.SysUserModel.FindOneByPhone(in.Phone)
 		if err != nil && err != sqlc.ErrNotFound {
-			return nil, err
+			return &tfr, nil
 		}
 	}
 	tfr.Id = user.Id
@@ -44,13 +44,15 @@ func (l *GetUserLogic) GetUser(in *transform.UserRequest) (*transform.UserRespon
 	tfr.Status = user.Status.Int64
 	ext, err := l.svcCtx.ErpUtil.InRoles(user.Id, "TMKZHUGUAN", "LAMK", "TMKmanager", "TMKassistant", "NetTMKdirector", "NetTMKassistant", "LAMKM", "LATMK")
 	if err != nil {
-		return nil, err
+		return &tfr, nil
 	}
 	tfr.IsJzMk = ext
-	mk, err := l.svcCtx.MktPartTimeUser.FindOneByPhone(in.Phone)
-	if err == nil && mk.Id != 0 {
-		tfr.IsJzMem = true
-		return nil, err
+	if in.Phone != "" {
+		mk, err := l.svcCtx.MktPartTimeUser.FindOneByPhone(in.Phone)
+		if err == nil && mk.Id != 0 {
+			tfr.IsJzMem = true
+			return &tfr, nil
+		}
 	}
 	return &tfr, nil
 }

internal/svc/servicecontext.go

@@ -12,48 +12,6 @@ import (
 	"git.i2edu.net/i2/go-zero/core/stores/sqlx"
 )
 
-// RoleIdsMap 定义角色映射
-var RoleIdsMap = map[string]string{
-	"TA":                     "0149c7c3-0c84-4609-9d73-688c176d0b26",
-	"VP(Vice President)":     "0256f33b-8a08-4b4e-9d00-ffda70a4f117",
-	"TMKZHUGUAN":             "03303f2e-011c-42d2-abad-7716479f2f2e",
-	"LAMK":                   "1",
-	"HQLAFin":                "108",
-	"FT":                     "11",
-	"LACTAman":               "113",
-	"HQFinD":                 "147",
-	"TMKmanager":             "156",
-	"TMKassistant":           "160",
-	"fzjl":                   "165",
-	"NetTMKdirector":         "176",
-	"CRM":                    "178",
-	"NetTMKassistant":        "184",
-	"CWCN":                   "1c24104c-53ed-4cd7-b082-c08723e05ef0",
-	"LAEC":                   "2",
-	"QGYG":                   "2554652e-9c42-4dbd-8fed-9415d1ee52f0",
-	"LATAM":                  "2719ca1d-0181-4a33-9285-c6bf7297c128",
-	"LANEC":                  "297da937-cbe5-4f45-862f-048aafd9a312",
-	"student/readingStudent": "945e25cf-feb8-44a5-8878-c394412baa16",
-	"LAMKM":                  "302de654-7547-4ff7-adfa-18e64bfec4ba",
-	"LAFAM":                  "307a0f29-29bb-45df-9ab3-b147d659842c",
-	"LAschoolmaster":         "4",
-	"LAECM":                  "50f777c3-401b-4846-aa4d-951e09260d70",
-	"waishibuHR":             "5b16322d-1538-4cea-b22b-77d439ce1ae8",
-	"LATMK":                  "612f71b2-51cb-409c-8a59-265699a179f2",
-	"XZ":                     "61fe4159-4859-4e45-a9df-3b22dfb24b03",
-	"zjl":                    "6a5f288a-3ebe-4d7a-b95e-74fbea7450a4",
-	"chanpin":                "a50e1e15-9626-40e7-94de-36cddc6f4d7c",
-	"sql":                    "afe1266c-679e-44f2-9a7a-ac362bb4679a",
-	"network":                "c3cae708-3490-46c4-968c-d7e3c2a2159f",
-	"HR":                     "d3ad774a-b71a-4be1-92d4-ab1087485c67",
-	"EC-zongjian":            "dc277f9a-4052-46ae-acfb-1151ccf16139",
-	"CWZG":                   "dfe858a6-614d-4fa1-873d-39aef650d35d",
-	"test":                   "e018daef-295b-4511-80fe-79887a1ac406",
-	"EA":                     "e828a24c-9a81-4d8e-b158-8c93e74c7aca",
-	"LAWL":                   "f0c63d0b-d0fc-4a1e-9897-01bbb6aa1b58",
-	"LAadmin":                "fc3560f6-e728-490f-aeea-613ed44668fa",
-}
-
 type ServiceContext struct {
 	Config          config.Config
 	SqlConn         sqlx.SqlConn
@@ -71,12 +29,12 @@ type ErpUtil struct {
 func (rp *ErpUtil) InRoles(userId string, roles ...string) (bool, error) {
 	user := model.SysUser{}
 	role := strings.Join(funk.Map(roles, func(r string) string { return fmt.Sprintf("'%v'", r) }).([]string), ",")
-	err := rp.SqlConn.QueryRow(&user, fmt.Sprintf(`SELECT sys_user_role.user_id id FROM sys_user_role
+	err := rp.SqlConn.QueryRowPartial(&user, fmt.Sprintf(`SELECT sys_user_role.user_id id FROM sys_user_role
 	left join sys_role on sys_role.id=sys_user_role.role_id 
 	where sys_role.code in (%v) and sys_role.del_flag=0 and sys_user_role.del_flag=0 and sys_user_role.user_id=?`, role), userId)
 	switch err {
 	case nil:
-		return false, nil
+		return true, nil
 	case sqlc.ErrNotFound:
 		return false, nil
 	default: