作者 tangxvhui

修复查询错误

@@ -555,13 +555,16 @@ func (srv TaskService) ListTask(param *command.ListTaskCommand) (map[string]inte @@ -555,13 +555,16 @@ func (srv TaskService) ListTask(param *command.ListTaskCommand) (map[string]inte
555 for _, val := range taskList { 555 for _, val := range taskList {
556 taskIdList = append(taskIdList, val.Id) 556 taskIdList = append(taskIdList, val.Id)
557 } 557 }
558 -  
559 - _, stageList, err := taskStageRepo.Find(map[string]interface{}{  
560 - "taskIdList": taskIdList,  
561 - })  
562 - if err != nil {  
563 - return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "查询任务阶段数据"+err.Error()) 558 + var stageList []*domain.TaskStage
  559 + if len(taskIdList) > 0 {
  560 + _, stageList, err = taskStageRepo.Find(map[string]interface{}{
  561 + "taskIdList": taskIdList,
  562 + })
  563 + if err != nil {
  564 + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "查询任务阶段数据"+err.Error())
  565 + }
564 } 566 }
  567 +
565 if err := transactionContext.CommitTransaction(); err != nil { 568 if err := transactionContext.CommitTransaction(); err != nil {
566 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 569 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
567 } 570 }
@@ -668,6 +671,9 @@ func (srv TaskService) ListTask2(param *command.SearchTaskCommand) (map[string]i @@ -668,6 +671,9 @@ func (srv TaskService) ListTask2(param *command.SearchTaskCommand) (map[string]i
668 if err != nil { 671 if err != nil {
669 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取用户的角色信息"+err.Error()) 672 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取用户的角色信息"+err.Error())
670 } 673 }
  674 + if len(param.SearchWord) > 0 {
  675 + param.SearchWord = "%" + param.SearchWord + "%"
  676 + }
671 if hrbpFlag == domain.RoleTypeSystem { 677 if hrbpFlag == domain.RoleTypeSystem {
672 listData, err := srv.listTask2ForHrbp(param) 678 listData, err := srv.listTask2ForHrbp(param)
673 return listData, err 679 return listData, err
@@ -681,11 +687,10 @@ func (srv TaskService) ListTask2(param *command.SearchTaskCommand) (map[string]i @@ -681,11 +687,10 @@ func (srv TaskService) ListTask2(param *command.SearchTaskCommand) (map[string]i
681 } 687 }
682 } 688 }
683 condition := dao.ListTaskCondition{ 689 condition := dao.ListTaskCondition{
684 - Limit: limit,  
685 - Offset: offset,  
686 - UserId: param.UserId,  
687 - CompanyId: param.CompanyId,  
688 - 690 + Limit: limit,
  691 + Offset: offset,
  692 + UserId: param.UserId,
  693 + CompanyId: param.CompanyId,
689 OnlyMy: param.OnlyMy, 694 OnlyMy: param.OnlyMy,
690 SearchWord: param.SearchWord, 695 SearchWord: param.SearchWord,
691 } 696 }