Merge remote-tracking branch 'origin/test' into test

@@ -5,5 +5,5 @@ type ListTargetUserAssessQuery struct {
 	AssessTaskId int      `json:"assessTaskId"`
 	AssessTaskId int      `json:"assessTaskId"`
 	TargetUserId int      `json:"targetUserId,string"`
 	TargetUserId int      `json:"targetUserId,string"`
 	CompanyId    int      `json:"companyId"`
 	CompanyId    int      `json:"companyId"`
-	Types        []string `json:"tyspes"`
+	Types        []string `json:"types"`
 }
 }

@@ -1780,10 +1780,10 @@ func (srv StaffAssessServeice) ListTargetUserAssess(param *query.ListTargetUserA
 	})
 	})
 	//获取员工的评估
 	//获取员工的评估
 	cnt, assessList, err := assessReps.Find(map[string]interface{}{
 	cnt, assessList, err := assessReps.Find(map[string]interface{}{
-		"assessTaskId": param.AssessTaskId,
-		"companyId":    param.CompanyId,
-		"targetUserId": param.TargetUserId,
-		"typesList":    param.Types,
+		"staffAssessTaskId": param.AssessTaskId,
+		"companyId":         param.CompanyId,
+		"targetUserId":      param.TargetUserId,
+		"typesList":         param.Types,
 	})
 	})
 	if err != nil {
 	if err != nil {
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取员工的评估"+err.Error())
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取员工的评估"+err.Error())

+package domain
+
+import "testing"
+
+func TestGenerateToken(t *testing.T) {
+	ut := UserAuth{
+		CompanyId:  526,
+		UserId:     3330346066045952,
+		Phone:      "15980201153",
+		PlatformId: 29,
+		AdminType:  1,
+	}
+	tk, _ := ut.CreateAccessToken()
+	t.Log(tk)
+}

@@ -44,11 +44,12 @@ func init() {
 
 
 	assessV2NS := web.NewNamespace("/v2/staff-assess",
 	assessV2NS := web.NewNamespace("/v2/staff-assess",
 		web.NSBefore(filters.AllowCors(), middlewares.CheckFontToken()),
 		web.NSBefore(filters.AllowCors(), middlewares.CheckFontToken()),
-		web.NSCtrlPost("/me/execute/invite/list", (*controllers.StaffAssessControllerV2).ListMeInviteUserAssess),     //我要执行的360评估的用户列表
-		web.NSCtrlPost("/me/execute/supper/list", (*controllers.StaffAssessControllerV2).ListMeSupperAssess),         //我要执行的360评估的用户列表
-		web.NSCtrlPost("/me/invite-user", (*controllers.StaffAssessControllerV2).GetAssessMeInviteUser),              //获取邀请的员工
-		web.NSCtrlPost("/target-user/self/info", (*controllers.StaffAssessControllerV2).GetAssessTargetUserSelfInfo), //获取被评估员工的自评反馈详情
-		web.NSCtrlPost("/self/me/info", (*controllers.StaffAssessControllerV2).GetAssessSelfMeInfo),                  //获取当前周期里我的自评反馈详情
+		web.NSCtrlPost("/me/execute/invite/list", (*controllers.StaffAssessControllerV2).ListMeInviteUserAssess),      //我要执行的360评估的用户列表
+		web.NSCtrlPost("/me/execute/supper/list", (*controllers.StaffAssessControllerV2).ListMeSupperAssess),          //我要执行的360评估的用户列表
+		web.NSCtrlPost("/me/invite-user", (*controllers.StaffAssessControllerV2).GetAssessMeInviteUser),               //获取邀请的员工
+		web.NSCtrlPost("/target-user/self/info", (*controllers.StaffAssessControllerV2).GetAssessTargetUserSelfInfo),  //获取被评估员工的自评反馈详情
+		web.NSCtrlPost("/self/me/info", (*controllers.StaffAssessControllerV2).GetAssessSelfMeInfo),                   //获取当前周期里我的自评反馈详情
+		web.NSCtrlPost("/target-user/invite/list", (*controllers.StaffAssessControllerV2).ListTargetUserInviteAssess), //获取被评估员工360评估的列表
 	)
 	)
 
 
 	web.AddNamespace(assessTaskNS)
 	web.AddNamespace(assessTaskNS)