作者 tangxvhui

Merge branch 'dev-tangxvhui' into test

... ... @@ -159,7 +159,7 @@ func (service *AuthService) MobileLogin(param *command.MobileLoginCommand) (map[
}
// 获取我的
func (service *AuthService) MeInfo(param *command.GetMeInfo) (*adapter.MeInfo, error) {
func (service *AuthService) MeInfo(param *command.GetMeInfo) (map[string]interface{}, error) {
transactionContext, err := factory.CreateTransactionContext(nil)
if err != nil {
... ... @@ -228,5 +228,7 @@ loop:
if len(parentUser) > 0 {
info.IsParent = true
}
return &info, nil
return map[string]interface{}{
"user": info,
}, nil
}
... ...
package notify
package service
import (
"encoding/json"
... ...
package controllers
import (
"github.com/linmadan/egglib-go/web/beego"
"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/notify/command"
"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/notify/service"
"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/port/beego/middlewares"
)
// 获取个人的消息提示
type MessagePersonalController struct {
beego.BaseController
}
// 周期综合自评是否开启,是否提示
func (c *MessagePersonalController) TodayMessageSummaryEvaluation() {
srv := service.NewMessagePersonalService()
userReq := middlewares.GetUser(c.Ctx)
param := command.GetUserMessageCommand{}
param.UserId = int(userReq.UserId)
data, err := srv.TodayMessageSummaryEvaluationSelf(&param)
c.Response(data, err)
}
... ...