Merge branch 'hotfix/attendance' into 'master'

Merge of hotfix/attendance 修复考勤可能的错误 to master

See merge request o2oa/o2oa!1227

o2web/source/x_component_Attendance/$AppealExplorer/listItem.json

@@ -12,7 +12,7 @@
     "title" : MWF.xApplication.Attendance.LP.employeeName,
     "headStyles" : "normalThNode",
     "contentStyles" : "normalTdNode",
-    "item" : "function(d){ return d.empName.split('@')[0] }",
+    "item" : "function(d){ return (d.empName || '').split('@')[0] }",
     "name" : "empName",
     "width" : "9%"
   },
@@ -20,7 +20,7 @@
     "title" : MWF.xApplication.Attendance.LP.department,
     "headStyles" : "normalThNode",
     "contentStyles" : "normalTdNode",
-    "item" : "function(d){ return d.unitName.split('@')[0] }",
+    "item" : "function(d){ return (d.unitName || '').split('@')[0] }",
     "name" : "unitName",
     "width" : "9%"
   },

o2web/source/x_component_Attendance/$ImportExplorer/listItem.json

@@ -27,7 +27,7 @@
     "title" : MWF.xApplication.Attendance.LP.uploadPerson,
     "headStyles" : "normalThNode",
     "contentStyles" : "normalTdNode",
-    "item" : "function(d){ return d.creatorUid.split('@')[0] }",
+    "item" : "function(d){ return (d.creatorUid || '').split('@')[0] }",
     "name" : "creatorUid",
     "width" : "20%"
   },

o2web/source/x_component_Attendance/$MyAppeal/listItem.json

@@ -3,7 +3,7 @@
     "title" : MWF.xApplication.Attendance.LP.name,
     "headStyles" : "normalThNode",
     "contentStyles" : "normalTdNode",
-    "item" : "function(d){ return d.empName.split('@')[0] }",
+    "item" : "function(d){ return (d.empName || '').split('@')[0] }",
     "name" : "empName",
     "width" : "20%"
   },

o2web/source/x_component_Attendance/$MyDetail/listItem.json

@@ -3,7 +3,7 @@
     "title" : MWF.xApplication.Attendance.LP.name,
     "headStyles" : "normalThNode",
     "contentStyles" : "normalTdNode",
-    "item" : "function( d ){ return d.empName.split('@')[0] }",
+    "item" : "function( d ){ return (d.empName || '').split('@')[0] }",
     "name" : "empName",
     "width" : "6%"
   },

o2web/source/x_component_Attendance/$MyDetail/listItem_detailStatic.json

@@ -3,7 +3,7 @@
     "title" : MWF.xApplication.Attendance.LP.unit,
     "headStyles" : "normalThNode",
     "contentStyles" : "normalTdNode",
-    "item" : "function( d ){ return d.unitName.split('@')[0] }",
+    "item" : "function( d ){ return (d.unitName || '').split('@')[0] }",
     "name" : "unitName",
     "width" : "10%"
   },
@@ -11,7 +11,7 @@
     "title" : MWF.xApplication.Attendance.LP.name,
     "headStyles" : "normalThNode",
     "contentStyles" : "normalTdNode",
-    "item" : "function( d ){ return d.employeeName.split('@')[0] }",
+    "item" : "function( d ){ return (d.employeeName || '').split('@')[0] }",
     "name" : "employeeName",
     "width" : "10%"
   },

o2web/source/x_component_Attendance/$PeopleDetail/listItem.json

@@ -3,7 +3,7 @@
     "title" :  MWF.xApplication.Attendance.LP.name,
     "headStyles" : "normalThNode",
     "contentStyles" : "normalTdNode",
-    "item" : "function( d ){ return d.empName.split('@')[0] }",
+    "item" : "function( d ){ return ( d.empName || '').split('@')[0] }",
     "name" : "empName",
     "width" : "6%"
   },

o2web/source/x_component_Attendance/$PeopleDetail/listItem_detailStatic.json

@@ -3,7 +3,7 @@
     "title" : MWF.xApplication.Attendance.LP.unit,
     "headStyles" : "normalThNode",
     "contentStyles" : "normalTdNode",
-    "item" : "function( d ){ return d.unitName.split('@')[0] }",
+    "item" : "function( d ){ return (d.unitName || '').split('@')[0] }",
     "name" : "unitName",
     "width" : "10%"
   },
@@ -11,7 +11,7 @@
     "title" : MWF.xApplication.Attendance.LP.name,
     "headStyles" : "normalThNode",
     "contentStyles" : "normalTdNode",
-    "item" : "function( d ){ return d.employeeName.split('@')[0] }",
+    "item" : "function( d ){ return (d.employeeName || '').split('@')[0] }",
     "name" : "employeeName",
     "width" : "10%"
   },

o2web/source/x_component_Attendance/$PeopleDetail/listItem_dingding.json

@@ -3,7 +3,7 @@
     "title": MWF.xApplication.Attendance.LP.name,
     "headStyles": "normalThNode",
     "contentStyles": "normalTdNode",
-    "item": "function( d ){ return d.o2User.split('@')[0] }",
+    "item": "function( d ){ return ( d.o2User || '').split('@')[0] }",
     "name": "o2User",
     "width": "20%"
   },

o2web/source/x_component_Attendance/$PeopleDetail/listItem_dingding_detailStatic.json

@@ -3,7 +3,7 @@
     "title" : MWF.xApplication.Attendance.LP.person,
     "headStyles": "normalThNode",
     "contentStyles": "normalTdNode",
-    "item": "function( d ){ return d.o2User.split('@')[0] }",
+    "item": "function( d ){ return ( d.o2User || '' ).split('@')[0] }",
     "name": "o2User",
     "width": "9%"
   },

o2web/source/x_component_Attendance/$PeopleDetail/listItem_qywx_detailStatic.json

@@ -3,7 +3,7 @@
     "title" : MWF.xApplication.Attendance.LP.person,
     "headStyles": "normalThNode",
     "contentStyles": "normalTdNode",
-    "item": "function( d ){ return d.o2User.split('@')[0] }",
+    "item": "function( d ){ return ( d.o2User || '' ).split('@')[0] }",
     "name": "o2User",
     "width": "9%"
   },

o2web/source/x_component_Attendance/$PermissionExplorer/listItem.json

@@ -11,7 +11,7 @@
     "title" : MWF.xApplication.Attendance.LP.permission.personName,
     "headStyles" : "normalThNode",
     "contentStyles" : "normalTdNode",
-    "item" : "function(d){ return d.adminName.split('@')[0] }",
+    "item" : "function(d){ return (d.adminName || '').split('@')[0] }",
     "name" : "adminName",
     "width" : "30%"
   },
@@ -19,7 +19,7 @@
     "title" : MWF.xApplication.Attendance.LP.permission.unit,
     "headStyles" : "normalThNode",
     "contentStyles" : "normalTdNode",
-    "item" : "function(d){ return d.unitName.split('@')[0] }",
+    "item" : "function(d){ return (d.unitName || '').split('@')[0] }",
     "name" : "unitName",
     "width" : "30%"
   },

o2web/source/x_component_Attendance/$PersonSetting/listItem.json

@@ -11,7 +11,7 @@
     "title" : MWF.xApplication.Attendance.LP.topUnitName,
     "headStyles" : "normalThNode",
     "contentStyles" : "normalTdNode",
-    "item" : "function(d){ return d.topUnitName.split('@')[0] }",
+    "item" : "function(d){ return (d.topUnitName || '').split('@')[0] }",
     "name" : "topUnitName",
     "width" : "20%"
   },
@@ -19,7 +19,7 @@
     "title" : MWF.xApplication.Attendance.LP.unitName,
     "headStyles" : "normalThNode",
     "contentStyles" : "normalTdNode",
-    "item" : "function(d){ return d.unitName.split('@')[0] }",
+    "item" : "function(d){ return (d.unitName || '').split('@')[0] }",
     "name" : "unitName",
     "width" : "20%"
   },
@@ -27,7 +27,7 @@
     "title" : MWF.xApplication.Attendance.LP.employeeName,
     "headStyles" : "normalThNode",
     "contentStyles" : "normalTdNode",
-    "item" : "function(d){ return d.employeeName.split('@')[0] }",
+    "item" : "function(d){ return (d.employeeName || '').split('@')[0] }",
     "name" : "employeeName",
     "width" : "10%"
   },

o2web/source/x_component_Attendance/$ScheduleExplorer/listItem.json

@@ -3,7 +3,7 @@
     "title": MWF.xApplication.Attendance.LP.schedule.unit,
     "headStyles" : "normalThNode",
     "contentStyles" : "normalTdNode",
-    "item" : "function(d){ return d.unitName.split('@')[0] }",
+    "item" : "function(d){ return (d.unitName || '').split('@')[0] }",
     "name" : "unitName",
     "width" : "11%"
   },

o2web/source/x_component_Attendance/$SelfHoliday/listItem.json

@@ -3,7 +3,7 @@
     "title": MWF.xApplication.Attendance.LP.department,
     "headStyles" : "normalThNode",
     "contentStyles" : "normalTdNode",
-    "item" : "function(d){ return d.unitName.split('@')[0] }",
+    "item" : "function(d){ return (d.unitName || '').split('@')[0] }",
     "name" : "unitName",
     "width" : "17%"
   },
@@ -11,7 +11,7 @@
     "title": MWF.xApplication.Attendance.LP.employeeName,
     "headStyles" : "normalThNode",
     "contentStyles" : "normalTdNode",
-    "item" : "function(d){ return d.employeeName.split('@')[0] }",
+    "item" : "function(d){ return (d.employeeName||'').split('@')[0] }",
     "name" : "employeeName",
     "width" : "13.5%"
   },

o2web/source/x_component_Attendance/$StatisticsCycle/listItem.json

@@ -3,7 +3,7 @@
     "title": MWF.xApplication.Attendance.LP.topUnitName,
     "headStyles": "normalThNode",
     "contentStyles" : "normalTdNode",
-    "item" : "function(d){ return d.topUnitName.split('@')[0] }",
+    "item" : "function(d){ return (d.topUnitName||'').split('@')[0] }",
     "name" : "topUnitName",
     "width" : "15%"
   },
@@ -11,7 +11,7 @@
     "title": MWF.xApplication.Attendance.LP.unitName,
     "headStyles" : "normalThNode",
     "contentStyles" : "normalTdNode",
-    "item" : "function(d){ return d.unitName.split('@')[0] }",
+    "item" : "function(d){ return (d.unitName || '').split('@')[0] }",
     "name" : "unitName",
     "width" : "15%"
   },

o2web/source/x_component_Attendance/$TopUnitDetail/listItem.json

@@ -3,7 +3,7 @@
     "title" :  MWF.xApplication.Attendance.LP.name,
     "headStyles" : "normalThNode",
     "contentStyles" : "normalTdNode",
-    "item" : "function( d ){ return d.empName.split('@')[0] }",
+    "item" : "function( d ){ return (d.empName||'').split('@')[0] }",
     "name" : "empName",
     "width" : "6%"
   },

o2web/source/x_component_Attendance/$TopUnitDetail/listItem_detailStatic.json

@@ -3,7 +3,7 @@
     "title" : MWF.xApplication.Attendance.LP.unit,
     "headStyles" : "normalThNode",
     "contentStyles" : "normalTdNode",
-    "item" : "function( d ){ return d.unitName.split('@')[0] }",
+    "item" : "function( d ){ return (d.unitName || '').split('@')[0] }",
     "name" : "unitName",
     "width" : "15%"
   },

o2web/source/x_component_Attendance/$UnitDetail/listItem.json

@@ -3,7 +3,7 @@
     "title" :  MWF.xApplication.Attendance.LP.name,
     "headStyles" : "normalThNode",
     "contentStyles" : "normalTdNode",
-    "item" : "function( d ){ return d.empName.split('@')[0] }",
+    "item" : "function( d ){ return (d.empName||'').split('@')[0] }",
     "name" : "empName",
     "defaultSort" : "asc",
     "width" : "6%"

o2web/source/x_component_Attendance/$UnitDetail/listItem_detailStatic.json

@@ -3,7 +3,7 @@
     "title" : MWF.xApplication.Attendance.LP.person,
     "headStyles" : "normalThNode",
     "contentStyles" : "normalTdNode",
-    "item" : "function( d ){ return d.employeeName.split('@')[0] }",
+    "item" : "function( d ){ return (d.employeeName||'').split('@')[0] }",
     "name" : "employeeName",
     "width" : "9%"
   },

o2web/source/x_component_Attendance/$UnitDetail/listItem_dingding.json

@@ -3,7 +3,7 @@
     "title": MWF.xApplication.Attendance.LP.name,
     "headStyles": "normalThNode",
     "contentStyles": "normalTdNode",
-    "item": "function( d ){ return d.o2User.split('@')[0] }",
+    "item": "function( d ){ return (d.o2User||'').split('@')[0] }",
     "name": "o2User",
     "width": "20%"
   },

o2web/source/x_component_Attendance/$UnitDetail/listItem_dingding_detailStatic.json

@@ -3,7 +3,7 @@
     "title" : MWF.xApplication.Attendance.LP.person,
     "headStyles": "normalThNode",
     "contentStyles": "normalTdNode",
-    "item": "function( d ){ return d.o2User.split('@')[0] }",
+    "item": "function( d ){ return (d.o2User||'').split('@')[0] }",
     "name": "o2User",
     "width": "9%"
   },

o2web/source/x_component_Attendance/$UnitDetail/listItem_qywx.json

@@ -3,7 +3,7 @@
     "title": MWF.xApplication.Attendance.LP.name,
     "headStyles": "normalThNode",
     "contentStyles": "normalTdNode",
-    "item": "function( d ){ return d.o2User.split('@')[0] }",
+    "item": "function( d ){ return (d.o2User||'').split('@')[0] }",
     "name": "o2User",
     "width": "20%"
   },

o2web/source/x_component_Attendance/$UnitDetail/listItem_qywx_detailStatic.json

@@ -3,7 +3,7 @@
     "title" : MWF.xApplication.Attendance.LP.person,
     "headStyles": "normalThNode",
     "contentStyles": "normalTdNode",
-    "item": "function( d ){ return d.o2User.split('@')[0] }",
+    "item": "function( d ){ return (d.o2User||'').split('@')[0] }",
     "name": "o2User",
     "width": "9%"
   },