From c21731c6641205ce10454edfb485becf7f2ef303 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 22 十二月 2020 09:26:03 +0800
Subject: [PATCH] 删除多余
---
src/main/java/com/nanometer/smartlab/dao/DangerousEncodeMapper.xml | 3 +++
src/main/java/com/nanometer/smartlab/controller/DangerousEncodeController.java | 8 +++++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/DangerousEncodeController.java b/src/main/java/com/nanometer/smartlab/controller/DangerousEncodeController.java
index d7a4639..d274fc5 100644
--- a/src/main/java/com/nanometer/smartlab/controller/DangerousEncodeController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/DangerousEncodeController.java
@@ -1,9 +1,7 @@
package com.nanometer.smartlab.controller;
import com.nanometer.smartlab.entity.DangerousEncode;
-import com.nanometer.smartlab.entity.dto.ContainerStatusMngDto;
import com.nanometer.smartlab.service.DangerousEncodeService;
-import com.nanometer.smartlab.util.Constants;
import com.nanometer.smartlab.util.FacesUtils;
import com.nanometer.smartlab.util.IDUtils;
import org.apache.log4j.Logger;
@@ -12,7 +10,6 @@
import org.primefaces.model.LazyDataModel;
import org.primefaces.model.SortOrder;
import org.springframework.context.annotation.Scope;
-import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Controller;
import javax.annotation.Resource;
@@ -54,6 +51,11 @@
this.setRowCount(pageCount);
if (pageCount > 0)
list = dangerousEncodeService.selectAll(dangerousEncodeFilter, isSearch?0:first, pageSize);
+ //查询更换模式
+ if (isSearch){
+ isSearch = false;
+ }
+
} catch (Exception e) {
logger.error("error occured.", e);
}
diff --git a/src/main/java/com/nanometer/smartlab/dao/DangerousEncodeMapper.xml b/src/main/java/com/nanometer/smartlab/dao/DangerousEncodeMapper.xml
index 5bb352b..b00b7a5 100644
--- a/src/main/java/com/nanometer/smartlab/dao/DangerousEncodeMapper.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/DangerousEncodeMapper.xml
@@ -249,6 +249,9 @@
</if>
</where>
order by update_time
+ <if test="offset !=null and pageSize != null">
+ limit #{offset},#{pageSize}
+ </if>
</select>
<select id="countAll" parameterType="java.util.Map" resultType="java.lang.Integer">
--
Gitblit v1.9.2