用户管理接口 接口

portal-service-common/src/main/java/com/hfln/portal/common/dto/data/user/AdminUserDto.java

@@ -28,8 +28,8 @@ public class AdminUserDto extends BaseDto {
     @Schema(description = "账户")
     private String account;
 
-    @Schema(description = "密码")
-    private String password;
+//    @Schema(description = "密码")
+//    private String password;
 
     @Schema(description = "手机号")
     private String phone;

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/WebTenantGatewayImpl.java

@@ -68,7 +68,7 @@ public class WebTenantGatewayImpl implements WebTenantGateway {
         } else {
 
             List<TblTenant> tenantList = tblTenantService.queryByCodeOrName(req.getTenantCode(), req.getTenantName());
-            if (CollectionUtils.isEmpty(tenantList) || tenantList.size() > 2 || !tenantList.get(0).getTenantId().equals(req.getTenantId())) {
+            if ((!CollectionUtils.isEmpty(tenantList) && tenantList.size() > 2) || !tenantList.get(0).getTenantId().equals(req.getTenantId())) {
                 throw new BizException(ErrorEnum.TENANT_IS_ALREADY_EXIST.getErrorCode(), ErrorEnum.TENANT_IS_ALREADY_EXIST.getErrorMessage());
             }
             // 更新租户