Merge branch 'develop' of gitadmin/tuoheng_oidc into release

tuoheng_oidc_admin/src/main/java/com/tuoheng/service/impl/TenantServiceImpl.java

@@ -654,7 +654,7 @@ public class TenantServiceImpl implements TenantService {
                 .eq(TenantEmploy::getTenantId, dto.getId()));
         tenantEmploys.forEach(t -> tenantEmployMapper.deleteById(t));
         //新增租户关联业务服务实例相关
-        StringBuilder PlatformName = new StringBuilder();
+        StringBuilder platformName = new StringBuilder();
         log.info(dto.getClientRoleDtoList().toString());
         for (ClientRoleDto clientRoleDto : list) {
             //获取clientId查询对应平台获取平台名称
@@ -664,8 +664,8 @@ public class TenantServiceImpl implements TenantService {
             if (ObjectUtil.isNull(platform)) {
                 return JsonResult.error("该业务平台不存在");
             }
-            PlatformName.append(platform.getPlatformName());
-            PlatformName.append(CommonConstant.SIGN);
+            platformName.append(platform.getPlatformName());
+            platformName.append(CommonConstant.SIGN);
             TenantEmploy tenantEmploy = new TenantEmploy();
             tenantEmploy.setTenantId(dto.getId());
             tenantEmploy.setPlatformCode(clientRoleDto.getClientId());
@@ -675,12 +675,12 @@ public class TenantServiceImpl implements TenantService {
             tenantEmployMapper.insert(tenantEmploy);
         }
         //拼接
-        vo.setPlatformName(PlatformName.substring(CommonConstant.ZERO, PlatformName.lastIndexOf(CommonConstant.SIGN)));
+        vo.setPlatformName(platformName.substring(CommonConstant.ZERO, platformName.lastIndexOf(CommonConstant.SIGN)));
         log.info("租户更新的业务服务实例表更新完毕");
         //更新租户原有数据基本
+        BeanUtils.copyProperties(dto, tenant);
         tenant.setName(dto.getTenantName())
-                .setCode(dto.getTenantCode())
-                .setId(dto.getId());
+                .setCode(dto.getTenantCode());
         tenantMapper.updateById(tenant);
         log.info("租户基本信息更新完毕");
         TenantItem oldTenantItem = tenantItemMapper.selectOne(Wrappers.<TenantItem>lambdaQuery().eq(TenantItem::getTenantId, dto.getId()));