fix 标签管理

jero-boot-modules/src/main/java/com/jero/modules/tag/controller/LawsAreaController.java

@@ -83,8 +83,8 @@ public class LawsAreaController extends JeroController<LawsArea, ILawsAreaServic
 	@AutoLog(value = "区域管理表-查询展示区域")
 	@ApiOperation(value="区域管理表-查询展示区域", notes="区域管理表-查询展示区域")
 	@GetMapping(value = "/queryShowArea")
-	public Result<List<LawsArea>> queryShowArea(@RequestParam(name = "cut") String cut, LawsArea lawsArea){
+	public Result<List<LawsArea>> queryShowArea(HttpServletRequest req, LawsArea lawsArea){
-		List<LawsArea> list = lawsAreaService.queryShowArea(cut, lawsArea);
+		List<LawsArea> list = lawsAreaService.queryShowArea(req, lawsArea);
 		return Result.OK(list);
 	}
 	/**

jero-boot-modules/src/main/java/com/jero/modules/tag/controller/LawsTagController.java

@@ -55,9 +55,13 @@ public class LawsTagController extends JeroController<LawsTag, ILawsTagService>
 	@AutoLog(value = "标签管理-分页列表查询")
 	@ApiOperation(value="标签管理-分页列表查询", notes="标签管理-分页列表查询")
 	@RequiresPermissions("tag:page")
-	@PostMapping(value = "/page")
+	@GetMapping(value = "/page")
-	public Result<?> queryPageList(@RequestBody Map<String,Object> params) {
+	public Result<?> queryPageList(@RequestBody LawsTag lawsTag,
-		IPage<LawsTag> pageList= lawsTagService.queryPageList(params);
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+
+		IPage<LawsTag> pageList= lawsTagService.queryPageList(lawsTag, pageNo, pageSize, req);
 		return Result.OK(pageList);
 	}
 

jero-boot-modules/src/main/java/com/jero/modules/tag/service/ILawsAreaService.java

@@ -68,7 +68,7 @@ public interface ILawsAreaService extends IService<LawsArea> {
 	 *
 	 * @return
 	 */
-	List<LawsArea> queryShowArea(String cut, LawsArea lawsArea);
+	List<LawsArea> queryShowArea(HttpServletRequest req, LawsArea lawsArea);
 
 	/**
 	 * 展示区域查询

jero-boot-modules/src/main/java/com/jero/modules/tag/service/ILawsTagService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.modules.tag.entity.LawsArea;
 import com.jero.modules.tag.entity.LawsTag;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 
@@ -61,7 +62,7 @@ public interface ILawsTagService extends IService<LawsTag> {
 	 *
 	 * @return
 	 */
-	IPage<LawsTag> queryPageList(Map<String, Object> params);
+	IPage<LawsTag> queryPageList(LawsTag lawsTag, Integer pageNo, Integer pageSize, HttpServletRequest req);
 
 	/**
 	 * 修改delFlag

jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/ILawsTagServiceImpl.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.constant.CommonConstant;
 import com.jero.common.constant.enums.LanguageEnum;
 import com.jero.common.constant.enums.YesOrNoEnum;
+import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
 import com.jero.modules.document.enums.FieldTypeEnum;
@@ -27,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -299,25 +301,12 @@ public class ILawsTagServiceImpl extends ServiceImpl<LawsTagMapper, LawsTag> imp
 
 	/**
 	 * 分页查询
-	 *
-	 * @param params
-	 * @return
 	 */
 	@Override
-	public IPage<LawsTag> queryPageList(Map<String,Object> params) {
+	public IPage<LawsTag> queryPageList(LawsTag lawsTag, Integer pageNo, Integer pageSize, HttpServletRequest req) {
-		Integer pageNo = Integer.parseInt(params.get("pageNo").toString());
+		QueryWrapper<LawsTag> queryWrapper = QueryGenerator.initQueryWrapper(lawsTag, req.getParameterMap());
-		Integer pageSize = Integer.parseInt(params.get("pageSize").toString());
+		Page<LawsTag> page = new Page<>(pageNo, pageSize);
-		IPage page = new Page(pageNo, pageSize);
+		IPage<LawsTag> result = page(page, queryWrapper);
-		IPage<LawsTag> result = lawsTagMapper.queryPageList(page, params);
-		List<LawsTag> records = result.getRecords();
-		String cut = (String) params.get("cut");
-		//中英切换-属性类型+展示区域列
-		if(LanguageEnum.EN.getValue().equals(cut)){
-			for(LawsTag data:records){
-				data.setFieldShowTypeName(data.getFieldShowTypeEnName());
-				data.setShowAreaName(data.getShowAreaEnName());
-			}
-		}
 		return result;
 	}
 

jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/LawsAreaServiceImpl.java

@@ -17,6 +17,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.List;
@@ -37,7 +38,7 @@ public class LawsAreaServiceImpl extends ServiceImpl<LawsAreaMapper, LawsArea> i
 	@Autowired
 	private LawsAreaServiceImpl onlCgformAreaService;
 
-	@Autowired
+	@Resource
 	private LawsAreaMapper lawsAreaMapper;
 
 	/**
@@ -192,9 +193,9 @@ public class LawsAreaServiceImpl extends ServiceImpl<LawsAreaMapper, LawsArea> i
 	 * @return
 	 */
 	@Override
-	public List<LawsArea> queryShowArea(String cut, LawsArea lawsArea) {
+	public List<LawsArea> queryShowArea(HttpServletRequest req, LawsArea lawsArea) {
-		QueryWrapper<LawsArea> queryWrapper = new QueryWrapper<>();
+		QueryWrapper<LawsArea> queryWrapper = QueryGenerator.initQueryWrapper(lawsArea,req.getParameterMap());
-		if (LanguageEnum.CN.getValue().equals(cut)) {
+		if (LanguageEnum.CN.equals(MessageUtils.getLanguage())) {
 			queryWrapper.select("id", "show_area").orderByAsc("sort");
 			return list(queryWrapper);
 		} else {