diff --git a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/LogResp.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/LogResp.java index 507657dd8..bf371ec2d 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/LogResp.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/LogResp.java @@ -18,6 +18,7 @@ import cn.crane4j.annotation.Assemble; import cn.crane4j.annotation.Mapping; +import cn.crane4j.annotation.condition.ConditionOnPropertyNotNull; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -49,6 +50,7 @@ public class LogResp implements Serializable { * 创建人 */ @JsonIgnore + @ConditionOnPropertyNotNull @Assemble(container = ContainerConstants.USER_NICKNAME, props = @Mapping(ref = "createUserString")) private Long createUser; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DeptDetailResp.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DeptDetailResp.java index 0b8d2b3d5..4874a3bfa 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DeptDetailResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DeptDetailResp.java @@ -19,14 +19,15 @@ import cn.crane4j.annotation.AssembleMethod; import cn.crane4j.annotation.ContainerMethod; import cn.crane4j.annotation.Mapping; +import cn.crane4j.annotation.condition.ConditionOnExpression; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; import top.charles7c.continew.admin.system.service.DeptService; -import top.charles7c.continew.starter.extension.crud.model.resp.BaseDetailResp; import top.charles7c.continew.starter.extension.crud.converter.ExcelBaseEnumConverter; +import top.charles7c.continew.starter.extension.crud.model.resp.BaseDetailResp; import java.io.Serial; @@ -55,6 +56,7 @@ public class DeptDetailResp extends BaseDetailResp { * 上级部门 ID */ @Schema(description = "上级部门 ID", example = "2") + @ConditionOnExpression(value = "#target.parentId != 0") @AssembleMethod(targetType = DeptService.class, method = @ContainerMethod(bindMethod = "get", resultType = DeptDetailResp.class), props = @Mapping(src = "name", ref = "parentName")) private Long parentId;