add

src/main/java/com/zfire/jiasm/syncdata/service/impl/AddInstallBusinessImpl.java

@@ -2559,20 +2559,21 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         op.setPgguid(mx.getPgguid());
         op.setMainId(String.valueOf(mx.getSpid()));
         op.setMainName(mx.getSpmc());
+
         if (sysDictRefDLMap.containsKey(String.valueOf(mx.getSpid()))){
             op.setMainId(sysDictRefDLMap.get(String.valueOf(mx.getSpid())).get(0).getDictCode());
             op.setMainName(sysDictRefDLMap.get(String.valueOf(mx.getSpid())).get(0).getDictValue());
         }
         op.setSmallId(String.valueOf(mx.getXlid()));
         op.setSmallName(mx.getXlmc());
-        if (!mx.getXlid().equals(0L) && sysDictRefXLMap.containsKey(String.valueOf(mx.getXlid()))) {
+        if (mx.getXlid()!=null && !mx.getXlid().equals(0L) && sysDictRefXLMap.containsKey(String.valueOf(mx.getXlid()))) {
             op.setSmallId(sysDictRefXLMap.get(String.valueOf(mx.getXlid())).get(0).getDictCode());
             op.setSmallName(sysDictRefXLMap.get(String.valueOf(mx.getXlid())).get(0).getDictValue());
         }
 
         op.setSeriesId(mx.getXiid());
         op.setSeriesName(mx.getXimc());
-        if (!mx.getXiid().equals("0") && sysDictRefXiLieMap.containsKey(mx.getXiid())) {
+        if (StringUtils.isNotEmpty(mx.getXiid()) && !mx.getXiid().equals("0") && sysDictRefXiLieMap.containsKey(mx.getXiid())) {
             op.setSeriesId(sysDictRefXiLieMap.get(mx.getXiid()).get(0).getDictCode());
             op.setSeriesName(sysDictRefXiLieMap.get(mx.getXiid()).get(0).getDictValue());
         }

src/main/java/com/zfire/jiasm/syncdata/service/impl/SettlementServiceImpl.java

@@ -1,6 +1,5 @@
 package com.zfire.jiasm.syncdata.service.impl;
 
-import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
 import com.zfire.jiasm.syncdata.service.SettlementService;
 import com.zfire.jiasm.syncdata.utils.OLDSystemUtil;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/zfire/jiasm/syncdata/utils/OLDSystemUtil.java

@@ -92,7 +92,7 @@ public class OLDSystemUtil {
 			}
 
 		} catch (Exception ex) {
-			log.error("[" + name + "]上传就系统失败", ex);
+			log.error("[" + name + "]上传旧系统失败", ex);
 		}
 
 	}