From 44a9e299965f9998160d8da2c4d0270f70cf9c76 Mon Sep 17 00:00:00 2001
From: dongzeliang <2746733890@qq.com>
Date: Wed, 26 Feb 2025 16:31:36 +0800
Subject: [PATCH] =?UTF-8?q?fix():=E4=BF=AE=E5=A4=8D=E5=9C=A8=E8=BD=AC?=
 =?UTF-8?q?=E6=8D=A2=E5=B7=A5=E7=A8=8B=E8=BF=87=E7=A8=8B=E4=B8=AD=E4=B8=A2?=
 =?UTF-8?q?=E5=A4=B1infoId=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/muyu/common/system/domain/SysLogininfor.java | 3 +++
 .../com/muyu/system/domain/model/SysLogininforListModel.java   | 2 ++
 .../com/muyu/system/service/impl/SysLogininforServiceImpl.java | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysLogininfor.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysLogininfor.java
index 4b429d3..2c7e333 100644
--- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysLogininfor.java
+++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysLogininfor.java
@@ -1,5 +1,7 @@
 package com.muyu.common.system.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.muyu.common.core.annotation.Excel;
 import com.muyu.common.core.annotation.Excel.ColumnType;
@@ -26,6 +28,7 @@ public class SysLogininfor {
      * ID
      */
     @Excel(name = "序号", cellType = ColumnType.NUMERIC)
+    @TableId(type = IdType.AUTO)
     private Long infoId;
 
     /**
diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysLogininforListModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysLogininforListModel.java
index 50748c4..fbd3c79 100644
--- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysLogininforListModel.java
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysLogininforListModel.java
@@ -13,6 +13,7 @@ import java.util.Date;
 
 /**
  * 用户登录日志查询模型对象
+ * @author dongzeliang
  */
 @Data
 @SuperBuilder
@@ -70,6 +71,7 @@ public class SysLogininforListModel extends QueryModel<SysLogininforListModel> {
 
     public static SysLogininforListModel buildSysLogininforListModel(SysLogininfor sysLogininfor) {
         return SysLogininforListModel.builder()
+                .infoId(sysLogininfor.getInfoId())
                 .ipaddr(sysLogininfor.getIpaddr())
                 .userName(sysLogininfor.getUserName())
                 .status(sysLogininfor.getStatus())
diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java
index fea5959..38dcf69 100644
--- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java
@@ -55,7 +55,7 @@ public class SysLogininforServiceImpl extends ServiceImpl<SysLogininforMapper, S
                 .eq(StringUtils.isNotEmpty(pageQueryModel.getStatus()), SysLogininfor::getStatus, pageQueryModel.getStatus())
                 .like(StringUtils.isNotEmpty(pageQueryModel.getUserName()), SysLogininfor::getUserName, pageQueryModel.getUserName())
                 .between(!ObjectUtil.hasNull(pageQueryModel.getBeginTime(),pageQueryModel.getEndTime()), SysLogininfor::getAccessTime, pageQueryModel.getBeginTime(), pageQueryModel.getEndTime()));
-       return new PageQueryModel<SysLogininforListModel>(){{
+       return new PageQueryModel<>(){{
           setDataList(page.getRecords().stream()
                   .map(SysLogininforListModel::buildSysLogininforListModel)
                   .toList());