Merge remote-tracking branch 'origin/uat' into uat

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

@@ -828,7 +828,7 @@ public class AnalysisDiyCustomerComponent {
                     SysUser user = sysUserService.selectUserByLoginName(userid);
                     if (("0").equals(user.getIsSync())) {
                         //查询该用户是否存在该接口返回中
-
+                        user.setPhonenumber(jo.getString("mobile"));
                         if (user.getSysUserExt().getIsCustomerManager() == null) {
                             user.getSysUserExt().setIsCustomerManager(isManager + "");
                             sysUserExtMapper.updateSysUserExt(user.getSysUserExt());
@@ -909,10 +909,9 @@ public class AnalysisDiyCustomerComponent {
                             }
                         }*/
                         /*解决名称不一样的情况*/
-                        if (!user.getUserName().equals(name)) {
                             user.setUserName(name);
                             sysUserService.updateUserInfo(user);
-                        }
+
                         List<AssRelcustomerinfo> assRelcustomerinfoList = new ArrayList<>();
                         /*过滤导购*/
                         if (isManager != 0 && !("019").equals(userOld.getSysUserExt().getOrgCode().substring(0, 3)) && !("019").equals(userOld.getSysUserExt().getCustomerCode().substring(0, 3))
@@ -1361,6 +1360,7 @@ public class AnalysisDiyCustomerComponent {
                     （首先查询当前用户职位，判断当前职位是否包含当前职位，不存在就更新，存在就不更新）*/
                     SysUser user = sysUserService.selectUserByLoginName(userid);
                     if(("0").equals(user.getIsSync())){
+                        user.setPhonenumber(jo.getString("mobile"));
                         //每个接口查询俩次是否有重复开始查询一次，快结束查一次
                         //查询该用户是否存在该接口返回中
                         sysUserService.insertUserRole(user.getUserId(), roleStoreIds[0]);
@@ -1392,10 +1392,9 @@ public class AnalysisDiyCustomerComponent {
                             sysUserExtMapper.updateSysUserExt(user.getSysUserExt());
                         }
                         /*解决名称不一样的情况*/
-                        if (!user.getUserName().equals(name)) {
                             user.setUserName(name);
                             sysUserService.updateUserInfo(user);
-                        }
+
 
 
                     }
@@ -1590,6 +1589,7 @@ public class AnalysisDiyCustomerComponent {
                     （首先查询当前用户职位，判断当前职位是否包含当前职位，不存在就更新，存在就不更新）*/
                     SysUser user = sysUserService.selectUserByLoginName(userid);
                     if(("0").equals(user.getIsSync())){
+                        user.setPhonenumber(jo.getString("mobile"));
                         //每个接口查询俩次是否有重复开始查询一次，快结束查一次
                         //查询该用户是否存在该接口返回中
                         sysUserService.insertUserRole(user.getUserId(), roleStoreIds[0]);
@@ -1619,10 +1619,9 @@ public class AnalysisDiyCustomerComponent {
                             sysUserExtMapper.updateSysUserExt(user.getSysUserExt());
                         }
                         /*解决名称不一样的情况*/
-                        if (!user.getUserName().equals(name)) {
                             user.setUserName(name);
                             sysUserService.updateUserInfo(user);
-                        }
+
 
 
                     }
@@ -1827,6 +1826,7 @@ public class AnalysisDiyCustomerComponent {
                     SysUser user = sysUserService.selectUserByLoginName(userid);
                     user.getSysUserExt().setSalesLevel("customer_level");
                     if(("0").equals(user.getIsSync())){
+                        user.setPhonenumber(jo.getString("mobile"));
                         //每个接口查询俩次是否有重复开始查询一次，快结束查一次
                         //查询该用户是否存在该接口返回中
                         if(user.getSysUserExt().getIsCustomerManager()==null ){
@@ -1863,10 +1863,8 @@ public class AnalysisDiyCustomerComponent {
                         }
                         sysUserExtMapper.updateSysUserExt(user.getSysUserExt());
                         /*解决名称不一样的情况*/
-                        if(!user.getUserName().equals(name)) {
                             user.setUserName(name);
                             sysUserService.updateUserInfo(user);
-                        }
                     }
                     sysUserExtMapper.updateSysUserExt(user.getSysUserExt());
                 }

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

@@ -183,7 +183,7 @@ public class HanaOrderComponent {
                 "\t LEFT JOIN ERP.ZHANAMATDOWN D ON D.MATNR = A.MATNR \n" +
                 "\t LEFT JOIN ERP.T001L E ON E.WERKS = A.WERKS AND E.LGORT = A.LGORT \n" +
                 "\t LEFT JOIN \"_SYS_BIC\".\"com.md/CAL_MAT_HIERARCHY_S\" CAL ON B.MATNR=CAL.MATNR AND A.VTWEG=CAL.VTWEG \n" +
-                "\t WHERE A.VKORG != '4000' AND A.VTWEG IN ('D9','Y9','D8') AND A.SPART != '16' AND A.AUART NOT IN ('31','32','33','35','36','39','29','11') " +
+                "\t WHERE A.VKORG != '4000' AND A.VTWEG IN ('D9','Y9','D8') AND A.SPART != '16' AND A.AUART NOT IN ('31','32','33','35','36','39','29','11','45') " +
                 "and ((A.ZCMGST !='信用通过' and A.ABGRU='') or (A.ZCMGST ='信用通过' and A.ABGRU=''))\n" +
                 " order by A.VBELN,A.POSNR " +
                 " ) T");