Merge remote-tracking branch 'origin/V0.0.5' into V0.0.5

project_data/sql/0.0.5/soc/soc.sql

@@ -105,8 +105,8 @@ INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (117, 1734903034555719
 INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (118, 1734903034555719682);
 INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (119, 1734903034555719682);
 INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (120, 1734903034555719682);
-delete  from sys_role_menu where menu_id in (select id from  sys_menu where perms='core:eduTask:report' and menu_name='报表查看' limit 1);
-delete  from sys_menu where perms='core:eduTask:report' and menu_name='报表查看' limit 1;
+delete  from sys_role_menu where menu_id in (select id from  sys_menu where perms='core:eduTask:report' and menu_name='报表查看');
+delete  from sys_menu where perms='core:eduTask:report' and menu_name='报表查看';
 delete  from sys_dict_type where  dict_type='monitor_org';
 INSERT INTO sys_dict_type (dict_name, dict_type, status, create_by, create_time, update_by, update_time, remark)
 VALUES ('调阅机构类型', 'monitor_org', '0', null, now(), null, now(), null);

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);
                 }