diff --git a/com.actionsoft.apps.coe.pal.datamigration/lib/com.actionsoft.apps.coe.pal.datamigration.jar b/com.actionsoft.apps.coe.pal.datamigration/lib/com.actionsoft.apps.coe.pal.datamigration.jar
index 94991a62..2abe82c5 100644
Binary files a/com.actionsoft.apps.coe.pal.datamigration/lib/com.actionsoft.apps.coe.pal.datamigration.jar and b/com.actionsoft.apps.coe.pal.datamigration/lib/com.actionsoft.apps.coe.pal.datamigration.jar differ
diff --git a/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/position/web/PositionExcelImportRun.java b/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/position/web/PositionExcelImportRun.java
index 7fb2a312..9e518016 100644
--- a/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/position/web/PositionExcelImportRun.java
+++ b/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/position/web/PositionExcelImportRun.java
@@ -151,7 +151,7 @@ public class PositionExcelImportRun {
                     String excelShapeName = model.getProcessShapeName();
                     String excelRoleName = model.getRoleName();
                     for (PalShapeInfoModel info : palShapeInfoModelList) {
-                        if (info.getShapeName().equals(excelShapeName) && info.getRoleShapeName().equals(excelRoleName)) {// 对比形状名称和角色名称
+                        if (UtilString.isNotEmpty(info.getShapeName()) && UtilString.isNotEmpty(info.getRoleShapeName()) && info.getShapeName().equals(excelShapeName) && info.getRoleShapeName().equals(excelRoleName)) {// 对比形状名称和角色名称
                             matchPal = info;
                             matched = true;
                             break;