Merge remote-tracking branch 'origin/dev_1.1.0' into dev_1.1.0

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBUserArchivesServiceImpl.java

@@ -266,12 +266,10 @@ public class TBUserArchivesServiceImpl extends ServiceImpl<TBUserArchivesMapper,
         tbUserArchivesSupplierService.save(tbUserArchivesSupplier);
 
         // 用户编辑 - 根据手机号关联更新
-        String loginName = mobileNumber;
         SysUser sysUser = new SysUser();
         if (userId != null && userId > 0) {
             // 编辑
             sysUser = sysUserService.getById(userId);
-            loginName = sysUser.getLoginName();
             List<RoleTypeEnum> roleTypeList = new ArrayList<>();
             roleTypeList.add(RoleTypeEnum.EFFECT_ENGINEER);
             roleTypeList.add(RoleTypeEnum.ASSISTANT_ENGINEER);
@@ -282,7 +280,7 @@ public class TBUserArchivesServiceImpl extends ServiceImpl<TBUserArchivesMapper,
                     Collectors.toList());
             roleIds.addAll(sysRoleIds);
         }
-        sysUser.setLoginName(loginName);
+        sysUser.setLoginName(mobileNumber);
         sysUser.setRealName(name);
         sysUser.setMobileNumber(mobileNumber);
         sysUser.setGender(gender);