作者 tangxvhui

只查询的正常的用户

@@ -479,7 +479,8 @@ func (srv StaffAssessServeice) createStaffAssess(transactionContext application. @@ -479,7 +479,8 @@ func (srv StaffAssessServeice) createStaffAssess(transactionContext application.
479 }) 479 })
480 //获取员工信息 480 //获取员工信息
481 _, userList, err := userRepo.Find(map[string]interface{}{ 481 _, userList, err := userRepo.Find(map[string]interface{}{
482 - "ids": selfUserId, 482 + "ids": selfUserId,
  483 + "status": 1,
483 }) 484 })
484 if err != nil { 485 if err != nil {
485 return nil, application.ThrowError(application.ARG_ERROR, "获取员工信息"+err.Error()) 486 return nil, application.ThrowError(application.ARG_ERROR, "获取员工信息"+err.Error())
@@ -780,7 +781,8 @@ func (srv StaffAssessServeice) SaveAssessInviteUser(param *command.SaveAssessInv @@ -780,7 +781,8 @@ func (srv StaffAssessServeice) SaveAssessInviteUser(param *command.SaveAssessInv
780 var inviteSameSuper []domain.StaffDesc 781 var inviteSameSuper []domain.StaffDesc
781 if len(inviteSameSuperId) > 0 { 782 if len(inviteSameSuperId) > 0 {
782 _, userList, err := userRepo.Find(map[string]interface{}{ 783 _, userList, err := userRepo.Find(map[string]interface{}{
783 - "ids": inviteSameSuperId, 784 + "ids": inviteSameSuperId,
  785 + "status": 1,
784 }) 786 })
785 if err != nil { 787 if err != nil {
786 return nil, application.ThrowError(application.ARG_ERROR, "获取用户信息"+err.Error()) 788 return nil, application.ThrowError(application.ARG_ERROR, "获取用户信息"+err.Error())
@@ -797,7 +799,8 @@ func (srv StaffAssessServeice) SaveAssessInviteUser(param *command.SaveAssessInv @@ -797,7 +799,8 @@ func (srv StaffAssessServeice) SaveAssessInviteUser(param *command.SaveAssessInv
797 var inviteDiffSuper []domain.StaffDesc 799 var inviteDiffSuper []domain.StaffDesc
798 if len(InviteDiffSuperId) > 0 { 800 if len(InviteDiffSuperId) > 0 {
799 _, userList, err := userRepo.Find(map[string]interface{}{ 801 _, userList, err := userRepo.Find(map[string]interface{}{
800 - "ids": InviteDiffSuperId, 802 + "ids": InviteDiffSuperId,
  803 + "status": 1,
801 }) 804 })
802 if err != nil { 805 if err != nil {
803 return nil, application.ThrowError(application.ARG_ERROR, "获取用户信息"+err.Error()) 806 return nil, application.ThrowError(application.ARG_ERROR, "获取用户信息"+err.Error())
@@ -1136,6 +1139,7 @@ func (srv StaffAssessServeice) SelectAssessInviteUser(param *query.SelectAssessI @@ -1136,6 +1139,7 @@ func (srv StaffAssessServeice) SelectAssessInviteUser(param *query.SelectAssessI
1136 "companyId": param.CompanyId, 1139 "companyId": param.CompanyId,
1137 "name": param.InviteUserName, 1140 "name": param.InviteUserName,
1138 "limit": 20, 1141 "limit": 20,
  1142 + "status": 1,
1139 } 1143 }
1140 if param.PageSize > 0 { 1144 if param.PageSize > 0 {
1141 condition["limit"] = param.PageSize 1145 condition["limit"] = param.PageSize
@@ -1862,7 +1866,8 @@ loop: @@ -1862,7 +1866,8 @@ loop:
1862 var chargeUserList []*domain.User 1866 var chargeUserList []*domain.User
1863 if len(chargeUserIds) > 0 { 1867 if len(chargeUserIds) > 0 {
1864 _, chargeUserList, err = userRepo.Find(map[string]interface{}{ 1868 _, chargeUserList, err = userRepo.Find(map[string]interface{}{
1865 - "ids": chargeUserIds, 1869 + "ids": chargeUserIds,
  1870 + "status": 1, //正常的用户
1866 }) 1871 })
1867 if err != nil { 1872 if err != nil {
1868 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取主管员工数据"+err.Error()) 1873 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取主管员工数据"+err.Error())