fix: 111

src/pages/Role/Hr/index.tsx

@@ -207,23 +207,23 @@ const Hr = () => {
                           }
                         }
                       }}
-                      name="showDepartment"
+                      name="showEmployee"
                       label={
                         <span className="flex items-center">
                           <EveryUser className="mr-1" className="flex items-baseline mr-1" />
-                          人资
+                          部门与员工
                         </span>
                       }
                     />
-                    <ProFormDependency name={['showDepartment']}>
-                      {({ showDepartment }) => (
+                    <ProFormDependency name={['showEmployee']}>
+                      {({ showEmployee }) => (
                         <ProFormCheckbox.Group
                           wrapperCol={{ offset: 1 }}
-                          name="department"
+                          name="employee"
                           options={[
-                            { value: 'access', label: '查看', disabled: !showDepartment },
-                            { value: 'add', label: '添加', disabled: !showDepartment },
-                            { value: 'delete', label: '删除', disabled: !showDepartment }
+                            { value: 'access', label: '查看', disabled: !showEmployee },
+                            { value: 'add', label: '添加', disabled: !showEmployee },
+                            { value: 'delete', label: '删除', disabled: !showEmployee }
                           ]}
                         />
                       )}

src/utils/utils.ts

@@ -22,7 +22,7 @@ export const isAntDesignProOrDev = (): boolean => {
 
 export const formatPermission = (type: 'init' | 'submit', values: any) => {
   if (type === 'init') {
-    const newValues = { ...JSON.parse(values) }
+    const newValues = (values && { ...JSON.parse(values) }) || {}
     // eslint-disable-next-line no-restricted-syntax
     for (const key in newValues) {
       if (Object.prototype.hasOwnProperty.call(newValues, key)) {
@@ -33,7 +33,7 @@ export const formatPermission = (type: 'init' | 'submit', values: any) => {
     }
     return newValues
   }
-  const newValues = { ...values }
+  const newValues = { ...(values || {}) }
   // eslint-disable-next-line no-restricted-syntax
   for (const key in newValues) {
     if (Object.prototype.hasOwnProperty.call(values, key)) {