diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java index 1d5c3c9da..5bebb9b29 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java @@ -70,12 +70,13 @@ public class PageQuery implements Serializable { if (CollUtil.isNotEmpty(orderItems)) { page.addOrder(orderItems); } + page.setOptimizeCountSql(false); return page; } /** * 构建排序 - * + *
* 支持的用法如下:
* {isAsc:"asc",orderByColumn:"id"} order by id asc
* {isAsc:"asc",orderByColumn:"id,createTime"} order by id asc,create_time asc
diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/domain/LxMaterialSeal.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/domain/LxMaterialSeal.java
index 13b508617..e97eae418 100644
--- a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/domain/LxMaterialSeal.java
+++ b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/domain/LxMaterialSeal.java
@@ -32,7 +32,7 @@ public class LxMaterialSeal extends BaseEntity {
/**
* 印章类型
*/
- private Long sealType;
+ private Integer sealType;
/**
* 公章名称
@@ -52,8 +52,8 @@ public class LxMaterialSeal extends BaseEntity {
/**
* 删除标志
*/
- @TableLogic
- private Long delFlag;
+ @TableLogic("del_flag")
+ private Integer delFlag;
}
diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/domain/vo/LxMaterialSealVo.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/domain/vo/LxMaterialSealVo.java
index 9f7e4a41c..20917d5e3 100644
--- a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/domain/vo/LxMaterialSealVo.java
+++ b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/domain/vo/LxMaterialSealVo.java
@@ -45,9 +45,15 @@ public class LxMaterialSealVo implements Serializable {
/**
* 印章管理员
*/
- @ExcelProperty(value = "印章管理员")
+ @ExcelProperty(value = "印章管理员id")
private Long sealAdminId;
+ /**
+ * 印章管理员姓名
+ */
+ @ExcelProperty(value = "印章管理员姓名")
+ private String sealAdminName;
+
/**
* 启用状态
*/
diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/mapper/LxMaterialSealMapper.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/mapper/LxMaterialSealMapper.java
index 9dc9d0cb6..e42b0ff47 100644
--- a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/mapper/LxMaterialSealMapper.java
+++ b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/mapper/LxMaterialSealMapper.java
@@ -1,5 +1,9 @@
package org.dromara.lx.operate.mapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.lx.operate.domain.LxMaterialSeal;
import org.dromara.lx.operate.domain.vo.LxMaterialSealVo;
@@ -12,4 +16,5 @@ import org.dromara.lx.operate.domain.vo.LxMaterialSealVo;
*/
public interface LxMaterialSealMapper extends BaseMapperPlus