员工上级的获取方式

@@ -280,30 +280,31 @@ func (srv StaffAssessServeice) AssessSelfList(param *query.AssessSelfListQuery)
 		log.Logger.Error("获取用户信息，" + err.Error())
 		log.Logger.Error("获取用户信息，" + err.Error())
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, "获取用户信息，"+err.Error())
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, "获取用户信息，"+err.Error())
 	}
 	}
-	departmentRepo := factory.CreateDepartmentRepository(map[string]interface{}{
-		"transactionContext": transactionContext,
-	})
-	var supperUserList []*domain.User
-	if len(userData.DepartmentId) > 0 {
-		_, departmentList, err := departmentRepo.Find(map[string]interface{}{
-			"ids": userData.DepartmentId,
-		})
-		if err != nil {
-			return nil, application.ThrowError(application.TRANSACTION_ERROR, "获取部门信息，"+err.Error())
-		}
-		var chargeUserIds []int64
-		for _, v := range departmentList {
-			chargeUserIds = append(chargeUserIds, v.ChargeUserIds...)
-		}
-		if len(chargeUserIds) > 0 {
-			_, supperUserList, err = userRepo.Find(map[string]interface{}{
-				"ids": chargeUserIds,
-			})
-			if err != nil {
-				return nil, application.ThrowError(application.TRANSACTION_ERROR, "获取员工上级信息，"+err.Error())
-			}
-		}
-	}
+	// departmentRepo := factory.CreateDepartmentRepository(map[string]interface{}{
+	// 	"transactionContext": transactionContext,
+	// })
+	// var supperUserList []*domain.User
+	// if len(userData.DepartmentId) > 0 {
+	// 	_, departmentList, err := departmentRepo.Find(map[string]interface{}{
+	// 		"ids": userData.DepartmentId,
+	// 	})
+	// 	if err != nil {
+	// 		return nil, application.ThrowError(application.TRANSACTION_ERROR, "获取部门信息，"+err.Error())
+	// 	}
+	// 	var chargeUserIds []int64
+	// 	for _, v := range departmentList {
+	// 		chargeUserIds = append(chargeUserIds, v.ChargeUserIds...)
+	// 	}
+	// 	if len(chargeUserIds) > 0 {
+	// 		_, supperUserList, err = userRepo.Find(map[string]interface{}{
+	// 			"ids": chargeUserIds,
+	// 		})
+	// 		if err != nil {
+	// 			return nil, application.ThrowError(application.TRANSACTION_ERROR, "获取员工上级信息，"+err.Error())
+	// 		}
+	// 	}
+	// }
+	supperUserList, _ := srv.getStaffSuper(transactionContext, *userData)
 	if err := transactionContext.CommitTransaction(); err != nil {
 	if err := transactionContext.CommitTransaction(); err != nil {
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 	}
 	}
@@ -325,7 +326,7 @@ func (srv StaffAssessServeice) AssessSelfList(param *query.AssessSelfListQuery)
 		UserName:       userData.Name,
 		UserName:       userData.Name,
 		CompanyName:    companyData.Name,
 		CompanyName:    companyData.Name,
 		SupperUserName: "",
 		SupperUserName: "",
-		DutyTime:       userData.CreatedAt.Local().Format("2006-01-02 15:04:05"),
+		DutyTime:       userData.EntryTime,
 	}
 	}
 	for _, v := range supperUserList {
 	for _, v := range supperUserList {
 		userInfo.SupperUserName = userInfo.SupperUserName + v.Name + " "
 		userInfo.SupperUserName = userInfo.SupperUserName + v.Name + " "