diff --git a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
index fb963a0e5..e8d2a79ec 100644
--- a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
+++ b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
@@ -4,7 +4,9 @@ import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
-
+import io.swagger.annotations.ApiImplicitParams;
+import java.util.HashMap;
+import springfox.documentation.annotations.ApiIgnore;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -56,7 +58,6 @@ public class ${entityName}Controller {
 
 	/**
 	  * 分页列表查询
-	 * @param ${entityName?uncap_first}
 	 * @return
 	 */
 	@ApiOperation(value = "分页列表查询${tableVo.ftlDescription}信息", notes = "分页列表查询${tableVo.ftlDescription}信息", httpMethod="GET")
@@ -65,24 +66,18 @@ public class ${entityName}Controller {
                 @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
         })
 	@GetMapping(value = "/page")
-	public Result<IPage<${entityName}>> queryPageList(@ApiIgnore @RequestBody Map<String, Object> map) {
-		QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initPageQueryWrapper(${entityName}.class, map);
-		Page<${entityName}> page = PageUtil.getPage(map);
-		IPage<${entityName}> pageList = ${entityName?uncap_first}Service.page(page, queryWrapper);
-		return Result.success(pageList);
+	public Result<IPage<${entityName}>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
+		return Result.success(${entityName?uncap_first}Service.queryPageList(paramMap));
 	}
 
 	/**
 	  * 列表查询
-	 * @param ${entityName?uncap_first}
-	 * @param req
 	 * @return
 	 */
 	@ApiOperation(value = "列表查询${tableVo.ftlDescription}信息", notes = "列表查询${tableVo.ftlDescription}信息", httpMethod="GET")
 	@GetMapping(value = "/list")
-	public Result<List<${entityName}>> queryList(@ApiIgnore HashMap<String, Object> paramMap) {
-		QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initPageQueryWrapper(${entityName}.class, paramMap);
-        return Result.success(${entityName?uncap_first}Service.list(queryWrapper));
+	public Result<List<${entityName}>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
+			return Result.success(${entityName?uncap_first}Service.queryList(paramMap));
 	}
 
 	/**
diff --git a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai
index e29ada3b6..49c713d4a 100644
--- a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai
+++ b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai
@@ -2,6 +2,9 @@ package ${bussiPackage}.${entityPackage}.service;
 
 import ${bussiPackage}.${entityPackage}.entity.${entityName};
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * @Description: ${tableVo.ftlDescription}
@@ -11,4 +14,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface I${entityName}Service extends IService<${entityName}> {
 
+    IPage<${entityName}> queryPageList(HashMap<String, Object> paramMap);
+
+    List<${entityName}> queryList(HashMap<String, Object> paramMap);
 }
diff --git a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
index a1fe96932..a3ab5f511 100644
--- a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
+++ b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
@@ -4,8 +4,14 @@ import ${bussiPackage}.${entityPackage}.entity.${entityName};
 import ${bussiPackage}.${entityPackage}.mapper.${entityName}Mapper;
 import ${bussiPackage}.${entityPackage}.service.I${entityName}Service;
 import org.springframework.stereotype.Service;
-
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zhgd.jeecg.common.system.query.QueryGenerator;
+import com.zhgd.xmgl.util.PageUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * @Description: ${tableVo.ftlDescription}
@@ -15,5 +21,27 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  */
 @Service
 public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, ${entityName}> implements I${entityName}Service {
+     @Override
+        public IPage<${entityName}> queryPageList(HashMap<String, Object> paramMap) {
+            QueryWrapper<${entityName}> queryWrapper = getQueryWrapper(paramMap);
+            Page<${entityName}> page = PageUtil.getPage(paramMap);
+            IPage<${entityName}> pageList = this.page(page, queryWrapper);
+            pageList.setRecords(dealList(pageList.getRecords()));
+            return pageList;
+        }
 
+        @Override
+        public List<${entityName}> queryList(HashMap<String, Object> paramMap) {
+            QueryWrapper<${entityName}> queryWrapper = getQueryWrapper(paramMap);
+            return dealList(this.list(queryWrapper));
+        }
+
+        private QueryWrapper<${entityName}> getQueryWrapper(HashMap<String, Object> paramMap) {
+            QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initPageQueryWrapper(${entityName}.class, paramMap);
+            return queryWrapper;
+        }
+
+        private List<${entityName}> dealList(List<${entityName}> list) {
+            return list;
+        }
 }