租赁库同步数据bug修改

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hire/service/impl/DepositoryManageBaseServiceImpl.java

@@ -322,9 +322,10 @@ public class DepositoryManageBaseServiceImpl extends ServiceImpl<DepositoryManag
             return newSysOrg;
         }
 
-        String lessorOrgName = baseInfo.getLessorOrgName();
+        String lessorOrgName = convertLessorOrgName(baseInfo.getLessorOrgName());
         NewSysOrg fatherOrg = newSysOrgService.lambdaQuery()
-                .eq(NewSysOrg::getOrgName, lessorOrgName)
+                .and(wrapper -> wrapper.eq(NewSysOrg::getOrgName, lessorOrgName)
+                        .or().eq(NewSysOrg::getOrgName, lessorOrgName.replace("公司", "经营部")))
                 .le(SysOrg::getTreeLevel, 3)
                 .eq(SysOrg::getIsDept, "0")
                 .eq(NewSysOrg::getStatus, "0")
@@ -380,6 +381,25 @@ public class DepositoryManageBaseServiceImpl extends ServiceImpl<DepositoryManag
         return fatherOrg;
     }
 
+    private String convertLessorOrgName(String orgName) {
+        if (orgName.contains("-")) {
+            // 找到"-"的位置
+            int dashIndex = orgName.indexOf("-");
+            // 截取"-"之后的内容
+            orgName = orgName.substring(dashIndex + 1);
+        }
+        if ("黑龙江公司".equals(orgName)) {
+            orgName = "哈尔滨经营部";
+        }
+        if ("深圳公司".equals(orgName)) {
+            orgName = "广西经营部";
+        }
+        if ("辽宁公司".equals(orgName)) {
+            orgName = "沈阳经营部";
+        }
+        return orgName;
+    }
+
 
     /**
      * 附件内容转换