add

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

@@ -720,7 +720,7 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
         v.setCreateBy("system");
         v.setUpdateBy("system");
         v.setCreateTime(new Date());
-        v.setUpdateTime(new Date());
+        // v.setUpdateTime(new Date());
         v.setStatus("ON");
         if (flag){
             v.setTestFlag("合格");
@@ -1029,7 +1029,7 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
             // 存在修改，不存在新增
             if (sfzens.contains(m.getSfzen().trim())){
                 // 最后修改日期比较 或 新数据为黑名单时一定要修改
-                if (v.getUpdateTime().compareTo(workerIdCardMap.get(v.getIdcard()).getUpdateTime())>0 ||
+                if (((v.getUpdateTime() != null) && v.getUpdateTime().compareTo(workerIdCardMap.get(v.getIdcard()).getUpdateTime())>0) ||
                         (v.getIsBlackList().equals(DictTypeEnum.HMD_TYPE_YES.getText()) &&
                         workerIdCardMap.get(m.getSfzen().trim()).getIsBlackList().equals(DictTypeEnum.HMD_TYPE_NO.getText()))){
                     v.setWorkerId(workerIdCardMap.get(m.getSfzen().trim()).getWorkerId());