Merge pull request #898 from KEEPER31337/feature/검색창_기수별_정렬순서_수정_#892

Feature/검색창 기수별 정렬순서 수정 #892
KEEPER31337 · Jun 4, 2024 · bc6a96e · bc6a96e
2 parents 3a59054 + e3f3b74
commit bc6a96e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/pages/admin/ActiveMemberManage/Input/MemberTypeChangeInput.tsx b/src/pages/admin/ActiveMemberManage/Input/MemberTypeChangeInput.tsx
@@ -15,7 +15,9 @@ const MemberTypeChangeInput = ({
 }: MemberTypeChangeInputProps) => {
   const options: { value: number; label: string; group: string }[] = [];
   memberList?.forEach((data) => options.push({ value: data.memberId, label: data.realName, group: data.generation }));
-  const sortedOptions = options.sort((a, b) => (a.group > b.group ? 1 : -1));
+  const sortedOptions = options.sort(
+    (a, b) => parseFloat(a.group) - parseFloat(b.group) || a.label.localeCompare(b.label),
+  );
 
   return (
     <AutoComplete

diff --git a/src/pages/admin/DutyManage/Modal/ChangeRolePersonModal.tsx b/src/pages/admin/DutyManage/Modal/ChangeRolePersonModal.tsx
@@ -29,7 +29,9 @@ const ChangeRolePersonModal = ({ open, toggleOpen, jobName, badgeImage }: Change
 
   const options: { value: number; label: string; group: string }[] = [];
   memberList?.forEach((data) => options.push({ value: data.memberId, label: data.realName, group: data.generation }));
-  const sortedOptions = options.sort((a, b) => (a.group > b.group ? 1 : -1));
+  const sortedOptions = options.sort(
+    (a, b) => parseFloat(a.group) - parseFloat(b.group) || a.label.localeCompare(b.label),
+  );
 
   const [value, setValue] = useState<SingleAutoCompleteValue>(null);
   const [prevInfo, setPrevInfo] = useState<{ value: number; label: string; group: string }>({