57897修改。

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java

@@ -72,9 +72,11 @@ public class CountryCardManageReleaseEOController extends JeroController<Country
 	@AutoLog(value = "问题知识库-country_card-管理发布表-列表查询")
     @ApiOperation(value="问题知识库-country_card-管理发布表-列表查询", notes="问题知识库-country_card-管理发布表-列表查询")
 	@GetMapping(value = "/list")
-	public Result<List<CountryCardManageReleaseEO>> queryList() {
+	public Result<List<CountryCardManageReleaseEO>> queryList(CountryCardManageReleaseEO countryCardManageReleaseEO,
-        List<CountryCardManageReleaseEO> list = countryCardManageReleaseEOService.queryList();
+															  HttpServletRequest req,
-        return Result.OK(list);
+															  @RequestParam(name="cut", defaultValue="cn") String cut) {
+        List<CountryCardManageReleaseEO> list = countryCardManageReleaseEOService.queryList(countryCardManageReleaseEO,req,cut);
+        return Result.OK(cut,list);
 	}
 
 	/**
@@ -208,7 +210,8 @@ public class CountryCardManageReleaseEOController extends JeroController<Country
 	 @ApiOperation(value="问题知识库-country_card-管理发布表-根据多个适用地区查询数据", notes="问题知识库-country_card-管理发布表-根据多个适用地区查询数据")
 	 @PostMapping(value = "/queryCountryCardManageReleaseByApplyMarkets")
 	 public Result<List<CountryCardManageReleaseEO>> queryCountryCardManageReleaseByApplyMarkets(@RequestBody JSONObject params) {
+		 String cut = params.getString("cut");
 		 List<CountryCardManageReleaseEO> list = countryCardManageReleaseEOService.queryCountryCardManageReleaseByApplyMarkets(params);
-		 return Result.OK(list);
+		 return Result.OK(cut,list);
 	 }
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java

@@ -5,6 +5,7 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.system.vo.DictModel;
 import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO;
 import com.baomidou.mybatisplus.extension.service.IService;
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -60,7 +61,9 @@ public interface ICountryCardManageReleaseEOService extends IService<CountryCard
 	 *
 	 * @return
 	 */
-    List<CountryCardManageReleaseEO> queryList();
+    List<CountryCardManageReleaseEO> queryList(CountryCardManageReleaseEO countryCardManageReleaseEO,
+											   HttpServletRequest req,
+											   String cut);
 
 	/**
 	 * 处理数据

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java

@@ -3,6 +3,7 @@ package com.jero.modules.problemKnowledgeBase.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jero.common.api.vo.Result;
+import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.DictModel;
 import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO;
 import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO;
@@ -29,6 +30,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * @Description: 问题知识库-country_card-管理发布表
  * @Author: jero-boot
@@ -123,8 +126,12 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl<CountryCa
 	 * @return
 	 */
 	@Override
-    public List<CountryCardManageReleaseEO> queryList() {
+    public List<CountryCardManageReleaseEO> queryList(CountryCardManageReleaseEO countryCardManageReleaseEO,
-        return list();
+													  HttpServletRequest req,
+													  String cut) {
+		QueryWrapper<CountryCardManageReleaseEO> queryWrapper = QueryGenerator.initQueryWrapper(countryCardManageReleaseEO, req.getParameterMap());
+		List<CountryCardManageReleaseEO> result = this.list(queryWrapper);
+		return result;
     }
 
 	@Override