作者 tangxvhui

修复问题

@@ -11,7 +11,7 @@ func TestGenerateToken(t *testing.T) { @@ -11,7 +11,7 @@ func TestGenerateToken(t *testing.T) {
11 CompanyId: 8, 11 CompanyId: 8,
12 UserId: 3422174102828544, 12 UserId: 3422174102828544,
13 Phone: "17708397664", 13 Phone: "17708397664",
14 - PlatformId: 29, 14 + PlatformId: 28,
15 AdminType: 1, 15 AdminType: 1,
16 } 16 }
17 tk, _ := ut.CreateAccessToken() 17 tk, _ := ut.CreateAccessToken()
@@ -281,7 +281,7 @@ func (d *StaffAssessDao) ListTargetUserNoInvite(companyId int, cycleId int, begi @@ -281,7 +281,7 @@ func (d *StaffAssessDao) ListTargetUserNoInvite(companyId int, cycleId int, begi
281 281
282 ) 282 )
283 select staff_assess.target_user ->>'userId' as user_id, 283 select staff_assess.target_user ->>'userId' as user_id,
284 - staff_assess.target_user ->>'userName' as user_name, 284 + staff_assess.target_user ->>'userName' as user_name
285 from staff_assess 285 from staff_assess
286 left join t1 on staff_assess.target_user ->>'userId'=t1.user_id 286 left join t1 on staff_assess.target_user ->>'userId'=t1.user_id
287 where 1=1 287 where 1=1
@@ -298,6 +298,13 @@ func (d *StaffAssessDao) ListTargetUserNoInvite(companyId int, cycleId int, begi @@ -298,6 +298,13 @@ func (d *StaffAssessDao) ListTargetUserNoInvite(companyId int, cycleId int, begi
298 return result, err 298 return result, err
299 } 299 }
300 300
  301 +type UserSelfStaffAssess struct {
  302 + CycleId string ``
  303 + AssessId string ``
  304 + TargetUserId string ``
  305 + TargetUserName string ``
  306 +}
  307 +
301 // 根据周期的id和日期获取员工评估的评估任务。有进行查看权限过滤 308 // 根据周期的id和日期获取员工评估的评估任务。有进行查看权限过滤
302 // companyId int 公司id 309 // companyId int 公司id
303 // cycleId int, 评估周期id 310 // cycleId int, 评估周期id
@@ -306,7 +313,7 @@ func (d *StaffAssessDao) ListTargetUserNoInvite(companyId int, cycleId int, begi @@ -306,7 +313,7 @@ func (d *StaffAssessDao) ListTargetUserNoInvite(companyId int, cycleId int, begi
306 // hrbp 是否搜索HRBP角色的用户可以查看,1:是;-1:否 313 // hrbp 是否搜索HRBP角色的用户可以查看,1:是;-1:否
307 // limit int, 分页条数 314 // limit int, 分页条数
308 // offset int 分页偏移 315 // offset int 分页偏移
309 -func (d *StaffAssessDao) SearchUserStaffAssess(param SearchConditin1) ([]UserAssessContent, error) { 316 +func (d *StaffAssessDao) SearchUserSelfStaffAssess(param SearchConditin1) ([]UserAssessContent, error) {
310 withSql := d.catchProjectIdByPermission(param.CompanyId, param.CycleId, param.OperaterId, param.Hrbp) 317 withSql := d.catchProjectIdByPermission(param.CompanyId, param.CycleId, param.OperaterId, param.Hrbp)
311 sqlStr := `select 318 sqlStr := `select
312 staff_assess.cycle_id , 319 staff_assess.cycle_id ,