调整同步机构逻辑

soc-modules/soc-modules-sync/src/main/java/com/xunmei/sync/dto/fjnxsync/FJNXOrgDto.java

@@ -163,4 +163,8 @@ public class FJNXOrgDto implements Serializable {
     @XmlElement(name = "socialTrustCode")
     private String socialTrustCode;
 
+    /**
+     *  自定义机构
+     */
+    private Integer customOrg;
 }

soc-modules/soc-modules-sync/src/main/java/com/xunmei/sync/service/impl/FJNXSyncServiceImpl.java

@@ -708,6 +708,7 @@ public class FJNXSyncServiceImpl implements IFJNXSyncService {
         // TODO 机构状态和机构类型转换
         org.setIsLock(ConvertOrgIsLockValue(fjnxOrg.getUsableFlag()));
         org.setSource(1);
+        org.setDeleted(0);
         return org;
 
     }
@@ -1068,7 +1069,12 @@ public class FJNXSyncServiceImpl implements IFJNXSyncService {
                 log.error("没有机构编码，机构名称:{}", item.getOrgName());
                 return;
             }
-            if(ObjectUtil.equal(item.getShortName(),"省联社") && !StringUtil.isNullOrEmpty(thirdPartySystemConfig.getFjnxSyncOrgOriginalRootOrgNewName()) )
+            if(!ObjectUtil.equal(item.getCustomOrg(),1) && !StringUtil.isNullOrEmpty(item.getOrgPath()) && !item.getOrgPath().startsWith("/"+thirdPartySystemConfig.getFjnxSyncOrgTopOrgCode())) {
+                log.error("机构Path非 900000000 开始，不予同步，机构名称:{}，机构编码{}", item.getOrgName(),item.getOrgCode());
+                return;
+            }
+
+            if(ObjectUtil.equal(item.getOrgCode(),thirdPartySystemConfig.getFjnxSyncOrgTopOrgCode()) && !StringUtil.isNullOrEmpty(thirdPartySystemConfig.getFjnxSyncOrgOriginalRootOrgNewName()) )
             {
                 item.setOrgName(thirdPartySystemConfig.getFjnxSyncOrgOriginalRootOrgNewName());
                 item.setShortName(thirdPartySystemConfig.getFjnxSyncOrgOriginalRootOrgNewName());
@@ -1260,6 +1266,7 @@ public class FJNXSyncServiceImpl implements IFJNXSyncService {
         customOrg.setCorporCode(thirdPartySystemConfig.getFjnxSyncOrgCustomRootOrgCode());
         customOrg.setOrgPath("/" + customOrg.getOrgCode());
         customOrg.setUsableFlag(1);
+        customOrg.setCustomOrg(1);
         return customOrg;
     }