From ca310e10eade271e62c23aa15a469350936be996 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Mon, 30 Dec 2024 08:41:24 +0800
Subject: [PATCH] 'commit'

---
 .../DataEase/Controller/DataEaseController.java   | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java
index 6a5272f6..a889467c 100644
--- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java
+++ b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java
@@ -337,7 +337,7 @@ public class DataEaseController extends Controller {
         //根据区域码，获取区域名称
         String area_name = rm.getAreaName(area_code);
 
-        Page<Record> pageList = dm.getDataSetContent(id, identity_id, area_name,keyword, pageNumber, pageSize);
+        Page<Record> pageList = dm.getDataSetContent(id, identity_id, area_name, keyword, pageNumber, pageSize);
         renderJson(CommonUtil.renderJsonForLayUI(pageList));
     }
 
@@ -394,7 +394,7 @@ public class DataEaseController extends Controller {
     @Before(GET.class)
     @IsLoginInterface({})
     @IsNumericInterface({"id"})
-    public void getDataSetContentByCity(int id,String keyword, int pageNumber, int pageSize) {
+    public void getDataSetContentByCity(int id, String keyword, int pageNumber, int pageSize) {
         if (pageNumber == 0) pageNumber = 1;
         if (pageSize == 0) pageSize = 20;
         //登录的人员
@@ -406,7 +406,7 @@ public class DataEaseController extends Controller {
         //根据区域码，获取区域名称
         String area_name = rm.getAreaName(area_code);
 
-        Page<Record> list = dm.getDataSetContentByCity(id,keyword, area_name, pageNumber, pageSize);
+        Page<Record> list = dm.getDataSetContentByCity(id, keyword, area_name, pageNumber, pageSize);
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
 
@@ -511,15 +511,18 @@ public class DataEaseController extends Controller {
     /**
      * 省级管理员，帮助市州、县区填报数据，需要获取指定数据集的数据
      *
-     * @param id 数据集id
+     * @param id         数据集id
+     * @param keyword    关键字
+     * @param pageNumber 第几页
+     * @param pageSize   每页显示多少条数据
      */
     @Before(GET.class)
     @IsLoginInterface({})
     @IsNumericInterface({"id"})
-    public void getDataSetContentByProvince(int id,String keyword, int pageNumber, int pageSize) {
+    public void getDataSetContentByProvince(int id, String keyword, int pageNumber, int pageSize) {
         if (pageNumber == 0) pageNumber = 1;
         if (pageSize == 0) pageSize = 20;
-        Page<Record> list = dm.getDataSetContentByProvince(id, keyword,pageNumber, pageSize);
+        Page<Record> list = dm.getDataSetContentByProvince(id, keyword, pageNumber, pageSize);
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }