Explorar el Código

feat(role): 添加角色所属租户校验并调整删除逻辑

- 在 AddRoleParam 中为 tenantId 添加非空校验注解
- 修改 WebGatewayImpl 中的角色删除逻辑,移除软删除标记直接物理删除- 更新 WebRoleController 的删除接口注释,明确操作为删除角色
- 修正 WebTenantGatewayImpl 中保存租户日志记录的 tenantId 获取方式
chejianzheng hace 3 semanas
padre
commit
4cc5388118

+ 1 - 1
portal-service-application/src/main/java/com/hfln/portal/application/controller/web/WebRoleController.java

@@ -33,7 +33,7 @@ public class WebRoleController {
     }
 
     @PostMapping("/delete")
-    @Operation(summary = "禁用角色")
+    @Operation(summary = "删除角色")
     public ApiResult<Void> deleteRole(@RequestParam Long roleId) {
 
         webGateway.deleteRole(roleId);

+ 1 - 1
portal-service-common/src/main/java/com/hfln/portal/common/request/web/AddRoleParam.java

@@ -1 +1 @@
-package com.hfln.portal.common.request.web;

import com.hfln.portal.common.vo.BaseVO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

import javax.validation.constraints.NotBlank;


@Data
public class AddRoleParam extends BaseVO {

    @Schema(description = "角色编码")
    @NotBlank(message = "角色编码不能为空!")
    private String roleCode;

    @Schema(description = "角色名称")
    @NotBlank(message = "角色名称不能为空!")
    private String roleName;

    @Schema(description = "角色描述")
    private String roleDesc;

    @Schema(description = "所属租户")
    private Long tenantId;
}
+package com.hfln.portal.common.request.web;

import com.hfln.portal.common.vo.BaseVO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

import javax.validation.constraints.NotBlank;


@Data
public class AddRoleParam extends BaseVO {

    @Schema(description = "角色编码")
    @NotBlank(message = "角色编码不能为空!")
    private String roleCode;

    @Schema(description = "角色名称")
    @NotBlank(message = "角色名称不能为空!")
    private String roleName;

    @Schema(description = "角色描述")
    private String roleDesc;

    @Schema(description = "所属租户")
    @NotBlank(message = "所属租户不能为空!")
    private Long tenantId;
}

+ 0 - 1
portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/WebGatewayImpl.java

@@ -457,7 +457,6 @@ public class WebGatewayImpl implements WebGateway {
         }
 
         // 3.软删除
-        role.setIsDeleted(BasePO.DeleteFlag.DELETED);
         tblRoleService.removeById(role);
     }
 

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

@@ -64,7 +64,7 @@ public class WebTenantGatewayImpl implements WebTenantGateway {
             TblTenant saveTenant = CopyUtils.copy(req, TblTenant.class);
             tblTenantService.save(saveTenant);
 
-            tblOprLogService.saveLog(req.getTenantId(), OprLogType.ADD_TENANT.getCode(), saveTenant);
+            tblOprLogService.saveLog(saveTenant.getTenantId(), OprLogType.ADD_TENANT.getCode(), saveTenant);
         } else {
 
             List<TblTenant> tenantList = tblTenantService.queryByCodeOrName(req.getTenantCode(), req.getTenantName());