修正获取erp账号信息，角色信息

internal/logic/get_erp_role_logic.go

@@ -38,7 +38,7 @@ func (l *GetErpRoleLogic) GetErpRole(in *transform.GetErpRoleReq) (*transform.Ge
 			sys_user_role on sys_user.id=sys_user_role.user_id  
 		  LEFT JOIN  sys_role on sys_user_role.role_id= sys_role.id   
 		  where 
-			sys_user_role.del_flag =0 and sys_user.status = 0 %s  GROUP BY sys_user.mobile`
+			sys_user_role.del_flag =0 and sys_user.status = 0 and sys_user.del_flag = 0 %s  GROUP BY sys_user.mobile`
 	var args string
 	if in.Mobile != "" {
 		args = in.Mobile

internal/logic/get_user_logic.go

@@ -26,35 +26,35 @@ func NewGetUserLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetUserLo
 }
 
 func (l *GetUserLogic) GetUser(in *transform.UserRequest) (*transform.UserResponse, error) {
-	var tfr transform.UserResponse
 	var user model.SysUser
 	if in.Id != "" && in.Id != "0" {
 		u, err := l.svcCtx.SysUserModel.FindOne(in.Id)
 		if err != nil && err != sqlc.ErrNotFound {
-			return &tfr, err
+			return &transform.UserResponse{}, err
 		} else if u != nil {
 			user = *u
 		}
 	} else if in.Phone != "" {
 		u, err := l.svcCtx.SysUserModel.FindOneByPhone(in.Phone)
 		if err != nil && err != sqlc.ErrNotFound {
-			return &tfr, err
+			return &transform.UserResponse{}, err
 		} else if u != nil {
 			user = *u
 		}
 	}
 	if user.Id == "" {
-		return &tfr, nil
+		return &transform.UserResponse{}, nil
 	}
-	tfr.Id = user.Id
-	tfr.Phone = user.Mobile
-	tfr.Status = user.Status.Int64
-	tfr.Gender = user.Gender
-	tfr.UserName = user.Name
+	var tfr transform.UserResponse
 	ext, err := l.svcCtx.ErpUtil.InRoles(user.Id, "TMKZHUGUAN", "LAMK", "TMKmanager", "TMKassistant", "NetTMKdirector", "NetTMKassistant", "LAMKM", "LATMK")
 	if err != nil {
-		return &tfr, err
+		return &transform.UserResponse{}, err
 	} else if ext {
+		tfr.Id = user.Id
+		tfr.Phone = user.Mobile
+		tfr.Status = user.Status.Int64
+		tfr.Gender = user.Gender
+		tfr.UserName = user.Name
 		tfr.ErpRoleType = 1
 	}
 	//if in.Phone != "" {

model/sys_user_model.go

@@ -80,7 +80,7 @@ func (m *defaultSysUserModel) FindOne(id string) (*SysUser, error) {
 	sysUserIdKey := fmt.Sprintf("%s%v", cacheSysUserIdPrefix, id)
 	var resp SysUser
 	err := m.QueryRow(&resp, sysUserIdKey, func(conn sqlx.SqlConn, v interface{}) error {
-		query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", sysUserRows, m.table)
+		query := fmt.Sprintf("select %s from %s where `id` = ? and  status = 0 and del_flag = 0 limit 1", sysUserRows, m.table)
 		return conn.QueryRow(v, query, id)
 	})
 	switch err {
@@ -97,7 +97,7 @@ func (m *defaultSysUserModel) FindOneByPhone(phone string) (*SysUser, error) {
 	sysUserIPhoneKey := fmt.Sprintf("%s%v", cacheSysUserPhonePrefix, phone)
 	var resp SysUser
 	err := m.QueryRow(&resp, sysUserIPhoneKey, func(conn sqlx.SqlConn, v interface{}) error {
-		query := fmt.Sprintf("select %s from %s where `mobile` = ? limit 1", sysUserRows, m.table)
+		query := fmt.Sprintf("select %s from %s where `mobile` = ? and status = 0  and del_flag = 0 limit 1 ", sysUserRows, m.table)
 		return conn.QueryRow(v, query, phone)
 	})
 	switch err {