物料主数据判断汉语品名调整

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyDeptApplicationImpl.java

@@ -75,8 +75,8 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
                     if (parentBaseInfo != null) {
                         if (baseInfo.getId().equals(parentBaseInfo.getId()) //表示是当前单据 忽略掉
                                 || parentBaseInfo.getStatusId() == 5  //排除终止的
-                                || baseInfo.getSourceId().equals(parentBaseInfo.getId())
-                                || baseInfo.getSourceId().equals(parentBaseInfo.getSourceId()) //扩展与变更
+                                || (baseInfo.getSourceId()!=null&&baseInfo.getSourceId().equals(parentBaseInfo.getId()))
+                                || (baseInfo.getSourceId()!=null&&baseInfo.getSourceId().equals(parentBaseInfo.getSourceId())) //扩展与变更
                         ) {
                         } else {
                             throw new RuntimeException("汉语品名:" + sdo.getString("maktx") + "已经存在！请检查输入");