Merge branch 'master' of https://gitea.anxinyun.cn/free-sun/HumanResource

web/client/src/sections/humanAffairs/containers/employeeInformation.jsx

@@ -37,7 +37,7 @@ const employeeInformation = (props) => {
                 { name: "职位", value: "userJob" },
                 { name: "岗位", value: "userPost" },
                 { name: "在职状态", value: "userActiveStatus" },
-                { name: "绩点", value: "point" },
+                { name: "绩点", value: "gradePoint" },
                 { name: "所属机构", value: "userOrganization" },
                 { name: "技术职级等级", value: "technicalGrade" },
                 { name: "证件号", value: "idNumber" },
@@ -83,7 +83,7 @@ const employeeInformation = (props) => {
         localStorage.getItem(EMPLOYEEINFORMATION) == null
             ? localStorage.setItem(
                 EMPLOYEEINFORMATION,
-                JSON.stringify(['userName', 'departmrnt', 'userJob', 'userPost', 'userActiveStatus', 'point', 'userOrganization', 'technicalGrade',
+                JSON.stringify(['userName', 'departmrnt', 'userJob', 'userPost', 'userActiveStatus', 'gradePoint', 'userOrganization', 'technicalGrade',
                     'hiredate', 'age', 'phoneNumber', 'marital', 'politicsStatus', 'educationBackground',
                     'graduatedFrom', 'employmentLife', 'occupationalHistory'])
             )
@@ -243,9 +243,11 @@ const employeeInformation = (props) => {
             }, {
                 title: '绩点',
                 width: 100,
-                dataIndex: "point",
+                dataIndex: "gradePoint",
-                key: "point",
+                key: "gradePoint",
-                render: (_, r, index) => <span>-</span>,
+                render: (_, r, index) => {
+                    return r.gradePoint || '-';
+                },
             }, {
                 title: (
                     <div>