Merge remote-tracking branch 'origin/fenxiao731' into prd

# Conflicts:
#	suishenbang-admin/src/main/resources/templates/system/alertConfiguration/add.html
#	suishenbang-admin/src/main/resources/templates/system/alertConfiguration/edit.html

suishenbang-admin/src/main/resources/application-prod.yml

@@ -105,7 +105,7 @@ spring:
 
   tms:
     #TMS接口地址
-    tmsUrl: https://lbtest.lutms.com/wuliu/apissbzt/ssb_update_authFile.do
+    tmsUrl: https://lb.lutms.com/wuliu/apissbzt/ssb_update_authFile.do
     tmsToken: EZS2020
     suishenbang: http://suishenbang.nipponpaint.com.cn/oneportal
   mail:

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

@@ -1567,7 +1567,7 @@ public class AnalysisDiyCustomerComponent {
 
                     /**======== 构建diy用户扩展信息表 start===============*/
                     SysUserExt userExt = new SysUserExt();
-                    userExt.setSalesLevel("reseller_level");
+                    userExt.setSalesLevel("customer_level");
                     userExt.setCustomerCode(jo.getString("depCode"));
                     userExt.setIsCustomerManager(isManager + "");
                     userExt.setSapEmployeeId(userNo);
@@ -1595,6 +1595,7 @@ public class AnalysisDiyCustomerComponent {
                     （首先查询当前用户职位，判断当前职位是否包含当前职位，不存在就更新，存在就不更新）*/
 
                     SysUser user = sysUserService.selectUserByLoginName(userid);
+                    user.getSysUserExt().setSalesLevel("customer_level");
                     if(("0").equals(user.getIsSync())){
                         //每个接口查询俩次是否有重复开始查询一次，快结束查一次
                         //查询该用户是否存在该接口返回中
@@ -1627,14 +1628,15 @@ public class AnalysisDiyCustomerComponent {
                                 }
                             }
                             log.info("updateSysUserExt" + customerCode);
-                            sysUserExtMapper.updateSysUserExt(user.getSysUserExt());
                         }
+                        sysUserExtMapper.updateSysUserExt(user.getSysUserExt());
                         /*解决名称不一样的情况*/
                         if(!user.getUserName().equals(name)) {
                             user.setUserName(name);
                             sysUserService.updateUserInfo(user);
                         }
                     }
+                    sysUserExtMapper.updateSysUserExt(user.getSysUserExt());
                 }
             }catch (Exception e) {
                 log.error(e.getMessage());