Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/admin
-  newTag: ddf4157b84f33c33305d857d4c520d1c2ffdfaae
+  newTag: b4e4c432bf7c084e674f201fc6d3c8184a6f2b75

src/pages/systemManage/accountManage/comp/addEditModal/index.tsx

@@ -79,7 +79,7 @@ const AddEditModal: React.FC<propType> = (props) => {
     form.setFieldsValue({
       ...data,
       companyId: companyList.find((i) => i.label === data.companyName)?.value,
-      roleId: data.roleInfoDTO.id,
+      roleId: data.roleInfoDTO?.id || undefined,
     });
   }, [companyList]);
   return (

src/router/router.tsx

@@ -783,7 +783,7 @@ export const routerList: Array<RouteObjectType> = [
         element: withLoadingComponent(<CategoryManage />),
         errorElement: <ErrorPage />,
         meta: {
-          id: 710,
+          id: 730,
           title: '培训分类',
           icon: <AppstoreAddOutlined />,
         },
@@ -793,7 +793,7 @@ export const routerList: Array<RouteObjectType> = [
         element: withLoadingComponent(<InstitutionsListView />),
         errorElement: <ErrorPage />,
         meta: {
-          id: 720,
+          id: 710,
           title: '执照考试',
           icon: <VerifiedOutlined />,
         },
@@ -803,7 +803,7 @@ export const routerList: Array<RouteObjectType> = [
         element: withLoadingComponent(<AddInstitutionsView />),
         errorElement: <ErrorPage />,
         meta: {
-          id: 721,
+          id: 711,
           title: '机构上传',
           icon: <UserOutlined />,
           hidden: true,
@@ -814,7 +814,7 @@ export const routerList: Array<RouteObjectType> = [
         element: withLoadingComponent(<AddInstitutionsView />),
         errorElement: <ErrorPage />,
         meta: {
-          id: 722,
+          id: 712,
           title: '机构编辑',
           icon: <UserOutlined />,
           hidden: true,
@@ -825,7 +825,7 @@ export const routerList: Array<RouteObjectType> = [
         element: withLoadingComponent(<CourseManageView />),
         errorElement: <ErrorPage />,
         meta: {
-          id: 730,
+          id: 720,
           icon: <BookOutlined />,
           title: '课程管理',
         },