qxm-立邦人员组织架构新增两层，对应解析修改

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/domain/MetaEmployeeDiy.java

@@ -90,6 +90,10 @@ public class MetaEmployeeDiy extends BaseEntity
     private String objid6;
 
     private String stext6;
+
+    private String objid7;
+
+    private String stext7;
     private String objidQy;
     private String stextQy;
     private String dataversion;
@@ -430,7 +434,23 @@ public class MetaEmployeeDiy extends BaseEntity
         this.dataversion = dataversion;
     }
 
-    public String getDataversion() 
+    public String getObjid7() {
+        return objid7;
+    }
+
+    public void setObjid7(String objid7) {
+        this.objid7 = objid7;
+    }
+
+    public String getStext7() {
+        return stext7;
+    }
+
+    public void setStext7(String stext7) {
+        this.stext7 = stext7;
+    }
+
+    public String getDataversion()
     {
         return dataversion;
     }

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/impl/AnalysisSysUserService.java

@@ -146,7 +146,7 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                     if(companySet.contains(postName)){
                         //先处理特殊的第三级 区公司级别
                         userExt.setSalesLevel("company_level");
-                        userExt.setOrgName(m.getStext3());
+                        userExt.setOrgName(m.getStext4());
                         setExtOrgCodeOn3(salesTreeMap,userExt);
 
                     }else {
@@ -299,7 +299,9 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
      * @return
      */
     public String getStext(MetaEmployeeDiy m){
-        if(m.getStext6()!=null&&!m.getStext6().trim().equals("")){
+        if(m.getStext7()!=null&&!m.getStext7().trim().equals("")){
+            return m.getStext7();
+        }else if(m.getStext6()!=null&&!m.getStext6().trim().equals("")){
             return m.getStext6();
         }else if(m.getStext5()!=null&&!m.getStext5().trim().equals("")){
             return m.getStext5();
@@ -320,8 +322,12 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
      * @return
      */
     public String getStextSecond(MetaEmployeeDiy m){
-        if(m.getStext6()!=null&&!m.getStext6().trim().equals("")){
-            if(m.getStext5()!=null&&!m.getStext5().trim().equals("")) {
+        if(m.getStext7()!=null&&!m.getStext7().trim().equals("")){
+            if(m.getStext6()!=null&&!m.getStext6().trim().equals("")) {
+                return m.getStext6();
+            }
+        }else if(m.getStext6()!=null&&!m.getStext6().trim().equals("")){
+            if(m.getStext5()!=null&&!m.getStext5().trim().equals("")){
                 return m.getStext5();
             }
         }else if(m.getStext5()!=null&&!m.getStext5().trim().equals("")){

suishenbang-sync/suishenbang-sync-common/src/main/resources/mapper/sync/MetaEmployeeDiyMapper.xml

@@ -42,6 +42,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="stext5"    column="stext_5"    />
         <result property="objid6"    column="objid_6"    />
         <result property="stext6"    column="stext_6"    />
+        <result property="objid7"    column="objid_7"    />
+        <result property="stext7"    column="stext_7"    />
         <result property="objidQy"    column="objid_qy"    />
         <result property="stextQy"    column="stext_qy"    />
         <result property="dataversion"    column="dataversion"    />
@@ -53,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectMetaEmployeeDiyVo">
         select name, login_name, email, mobile, sap_employee_id, sap_cost_center_code, sap_cost_center, sap_company_code, status, objid_1, contract, contract_name, contract_begin, duty, duty_name, org, org_name, employee_post, employee_post_name, posty, poste, posnc, boss_employee_id,
         boss_name, boss_employee_post, sex, stext_1, objid_2, stext_2, objid_3, stext_3, objid_4,
-        stext_4, objid_5, stext_5, objid_6,stext_6, objid_qy,stext_qy,dataversion, etl_creatime, line_id, package_id from meta_employee_diy
+        stext_4, objid_5, stext_5, objid_6,stext_6, objid_7,stext_7, objid_qy,stext_qy,dataversion, etl_creatime, line_id, package_id from meta_employee_diy
     </sql>
 
     <select id="selectMetaEmployeeDiyList" parameterType="MetaEmployeeDiy" resultMap="MetaEmployeeDiyResult">