Merge branch 'main' of https://gitea.bpsoft.co.kr/nicepayments/nice-app-web

src/entities/account/ui/user-account-auth-wrap.tsx

@@ -13,7 +13,7 @@ export const UserAccountAuthWrap = ({
 }: UserAccountAuthWrapProps) => {
   const [currentStatus, setCurrentStatus] = useState(status);
   const [currentIdCL, setCurrentIdCl] = useState(idCL);
-  const [menuGrants, setMenuGrants] = useState<Array<UserMenuPermissionData>>([]);
+  const [permissions, setPermissions] = useState<Array<UserMenuPermissionData>>([]);
   const [hasChanges, setHasChanges] = useState(false);
   console.log('mid : ', mid);
   console.log('usrid : ', usrid);
@@ -24,20 +24,21 @@ export const UserAccountAuthWrap = ({
   useEffect(() => {
     if (mid && usrid) {
       console.log('userMenuPermissions');
-      userMenuPermissions({mid: mid, usrid: usrid}).then((res) => {
+      userMenuPermissions({mid: mid, usrid: usrid}).then((res: any) => {
         console.log('res : ', res);
-        setMenuGrants(res?.data || res || []);
+        console.log('permissions : ', res?.permissions);
+        setPermissions(res?.permissions || []);
       }).catch((error) => {
         console.error('Failed to fetch menu permissions:', error);
-        setMenuGrants([]);
+        setPermissions([]);
       });
     }
   // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [mid, usrid]);
   
   useEffect(() => {
-    console.log('menuGrants : ', menuGrants);
-  }, [menuGrants]);
+    console.log('permissions : ', permissions);
+  }, [permissions]);
 
   // 변경 사항 감지
   useEffect(() => {
@@ -50,7 +51,7 @@ export const UserAccountAuthWrap = ({
     {menuId: '30', parent: '30', menuName: '거래조회', subMenu: 
       [
         {menuId: '31', parent: '30', menuName: '거래내역조회'},
-        {menuId: '32', parent: '30', menuName: '현금영수증 발행'},
+        {menuId: '32', parent: '30', menuName: '현금영수증발행'},
         {menuId: '33', parent: '30', menuName: '에스크로'},
         {menuId: '34', parent: '30', menuName: '빌링'}
       ]
@@ -61,15 +62,15 @@ export const UserAccountAuthWrap = ({
         {menuId: '37', parent: '35', menuName: '정산내역'},
       ]
     },
-    {menuId: '38', parent: '38', menuName: '가맹점 관리', subMenu: 
+    {menuId: '38', parent: '38', menuName: '가맹점관리', subMenu: 
       [
-        {menuId: '39', parent: '38', menuName: '가맹점 정보'},
-        {menuId: '40', parent: '38', menuName: '등록 현황'},
+        {menuId: '39', parent: '38', menuName: '가맹점정보'},
+        {menuId: '40', parent: '38', menuName: '등록현황'},
       ]
     },
-    {menuId: '41', parent: '41', menuName: '결제 관리', subMenu: 
+    {menuId: '41', parent: '41', menuName: '결제관리', subMenu: 
       [
-        {menuId: '42', parent: '41', menuName: '결제 정보'},
+        {menuId: '42', parent: '41', menuName: '결제정보'},
         {menuId: '43', parent: '41', menuName: '결제데이터통보'},
       ]
     },
@@ -81,7 +82,7 @@ export const UserAccountAuthWrap = ({
     },
     {menuId: '47', parent: '47', menuName: '부가세신고자료', subMenu: 
       [
-        {menuId: '48', parent: '47', menuName: '부가세신고자료'},
+        {menuId: '48', parent: '47', menuName: '세금계산서'},
         {menuId: '49', parent: '47', menuName: '부가세참고'},
       ]
     },
@@ -89,14 +90,14 @@ export const UserAccountAuthWrap = ({
       [
         {menuId: '51', parent: '50', menuName: '부가서비스소개'},
         {menuId: '52', parent: '50', menuName: '신용카드ARS카드결제'},
-        {menuId: '53', parent: '50', menuName: '계좌이체ARS카드결제'},
-        {menuId: '54', parent: '50', menuName: '가상계좌ARS카드결제'},
-        {menuId: '55', parent: '50', menuName: '휴대폰ARS카드결제'},
-        {menuId: '56', parent: '50', menuName: '계좌간편결제ARS카드결제'},
-        {menuId: '57', parent: '50', menuName: 'SSG머니ARS카드결제'},
-        {menuId: '58', parent: '50', menuName: 'SSG은행계좌ARS카드결제'},
-        {menuId: '59', parent: '50', menuName: '문화상품권ARS카드결제'},
-        {menuId: '60', parent: '50', menuName: '티머니페이ARS카드결제'},
+        {menuId: '53', parent: '50', menuName: '지급대행'},
+        {menuId: '54', parent: '50', menuName: '링크결제'},
+        {menuId: '55', parent: '50', menuName: '자금이체'},
+        {menuId: '56', parent: '50', menuName: 'KEY-IN결제'},
+        {menuId: '57', parent: '50', menuName: 'SMS결제통보'},
+        {menuId: '58', parent: '50', menuName: '알림톡결제통보'},
+        {menuId: '59', parent: '50', menuName: '계좌점유인증'},
+        {menuId: '60', parent: '50', menuName: '계좌성명조회'},
       ]
     },
     {menuId: '61', parent: '61', menuName: '고객지원', subMenu: 
@@ -139,7 +140,7 @@ export const UserAccountAuthWrap = ({
           idCL={ currentIdCL }
           status={ currentStatus }
           menuItems={ menuItems }
-          menuGrants={ menuGrants }
+          menuGrants={ permissions }
         ></UserAccountAuthPermList>
 
         <div className="apply-row bottom-padding">

src/entities/user/model/types.ts

@@ -115,8 +115,7 @@ export interface UserMenuPermissionsParams {
 }
 
 export interface UserMenuPermissionsResponse {
-  status: boolean;
-  data: Array<UserMenuPermissionData>;
+  permissions: Array<UserMenuPermissionData>;
 }
 
 export interface UserMenuPermissionsSaveParams {
@@ -134,6 +133,7 @@ export interface UserMenuPermissionData {
   menuId: number;
   usrid: string;
   grant: number;
+  defaultGrant: number;
 }
 
 export interface ChangePasswordParams {