diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/alertmessage/vo/AlertMessagePageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/alertmessage/vo/AlertMessagePageReqVO.java index 7a68954006..71e3b35824 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/alertmessage/vo/AlertMessagePageReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/alertmessage/vo/AlertMessagePageReqVO.java @@ -24,6 +24,9 @@ public class AlertMessagePageReqVO extends PageParam { @Schema(description = "用户ID", example = "20700") private Integer userid; + @Schema(description = "用户名", example = "张三") + private String username; + @Schema(description = "状态:0-未读 1-已读", example = "1") private Integer status; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/alertmessage/vo/AlertMessageRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/alertmessage/vo/AlertMessageRespVO.java index de4852453c..4e68dd135f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/alertmessage/vo/AlertMessageRespVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/alertmessage/vo/AlertMessageRespVO.java @@ -28,6 +28,10 @@ public class AlertMessageRespVO { @ExcelProperty("用户ID") private Integer userid; + @Schema(description = "用户名", example = "张三") + @ExcelProperty("用户名") + private String username; + @Schema(description = "状态:0-未读 1-已读", example = "1") @ExcelProperty("状态:0-未读 1-已读") private Integer status; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/alertmessage/vo/AlertMessageSaveReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/alertmessage/vo/AlertMessageSaveReqVO.java index 8688d52bd1..a4c4f65fd2 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/alertmessage/vo/AlertMessageSaveReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/alertmessage/vo/AlertMessageSaveReqVO.java @@ -24,6 +24,9 @@ public class AlertMessageSaveReqVO { @Schema(description = "用户ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20700") private Integer userid; + @Schema(description = "用户名", example = "张三") + private String username; + @Schema(description = "状态:0-未读 1-已读", example = "1") private Integer status; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/alertmessage/AlertMessageDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/alertmessage/AlertMessageDO.java index 15b9130533..9f85440f2a 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/alertmessage/AlertMessageDO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/alertmessage/AlertMessageDO.java @@ -42,6 +42,11 @@ public class AlertMessageDO { */ @TableField("userid") private Integer userid; + /** + * 用户名 + */ + @TableField("username") + private String username; /** * 状态:0-未读 1-已读 */ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/alertmessage/AlertMessageMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/alertmessage/AlertMessageMapper.java index 8f93f432a7..b1a863a56d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/alertmessage/AlertMessageMapper.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/alertmessage/AlertMessageMapper.java @@ -24,6 +24,7 @@ public interface AlertMessageMapper extends BaseMapperX { .eqIfPresent(AlertMessageDO::getAlerttype, reqVO.getAlerttype()) .eqIfPresent(AlertMessageDO::getContent, reqVO.getContent()) .eqIfPresent(AlertMessageDO::getUserid, reqVO.getUserid()) + .eqIfPresent(AlertMessageDO::getUsername, reqVO.getUsername()) .eqIfPresent(AlertMessageDO::getStatus, reqVO.getStatus()) .betweenIfPresent(AlertMessageDO::getCreatetime, reqVO.getCreatetime()) .betweenIfPresent(AlertMessageDO::getUpdatetime, reqVO.getUpdatetime())