Merge branch 'V0.0.5' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.0.5

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillPlanServiceImpl.java

@@ -854,6 +854,7 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
                 .count();
         if (count == 0) {
             plan.setParentId(plan.getId());
+            updateById(plan);
             List<CoreDrillPlan> list = new ArrayList<>();
             list.add(plan);
             return list;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingPlanServiceImpl.java

@@ -795,6 +795,7 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
                 .count();
         if (count == 0) {
             plan.setParentId(plan.getId());
+            updateById(plan);
             List<CoreEduTrainingPlan> list = new ArrayList<>();
             list.add(plan);
             return list;

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

@@ -881,23 +881,23 @@ public class FJNXSyncServiceImpl implements IFJNXSyncService {
 
             final Integer syncUserOrgLevel = getSyncUserOrgLevel(fjnxOrgOptional.get().getOrgPath(), specialOrgList);
 
-            //省联社下级机关部门下的人，迁移到顶级机构下
-//            if(ObjectUtil.equal(syncUserOrgLevel,1))
-//            {
-//                final Optional<SysOrg> topOrg = existOrgList.stream().filter(x -> x.getParentId().equals(-1L)).findFirst();
-//                if(topOrg.isPresent())
-//                {
-//                    return topOrg.get();
-//                }
-//                return null;
-//            }
+            //省联社下级机关部门下的人，迁移到省联社机构下
+            if(ObjectUtil.equal(syncUserOrgLevel,1))
+            {
+                final Optional<SysOrg> topOrg = existOrgList.stream().filter(x -> ObjectUtil.equal(thirdPartySystemConfig.getFjnxSyncOrgTopOrgCode(),x.getCode())).findFirst();
+                if(topOrg.isPresent())
+                {
+                    return topOrg.get();
+                }
+                return null;
+            }
 
             //办事处机构下，人员迁移到地区行社下
             if(ObjectUtil.equal(syncUserOrgLevel,2))
             {
 //                final String dqhsOrgCode = getUserOwnerBscOrgMapperDqhsOrgCode(fjnxOrgOptional.get().getOrgPath(), specialOrgList);
                 final String dqhsOrgCode = getUserOwnerBscOrgCode(fjnxOrgOptional.get().getOrgPath(), specialOrgList);
-                if(StringUtil.isNullOrEmpty(dqhsOrgCode))
+                if(!StringUtil.isNullOrEmpty(dqhsOrgCode))
                 {
                     return getSysOrgByOrgCode(existOrgList,dqhsOrgCode);
                 }