From 7fdc337e30daff98c55412318c1db31ffbadc81a Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期五, 20 十二月 2024 16:47:34 +0800
Subject: [PATCH] 区域

---
 src/main/java/com/whyc/service/KeyInfService.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/whyc/service/KeyInfService.java b/src/main/java/com/whyc/service/KeyInfService.java
index b2aa2bf..8c4e631 100644
--- a/src/main/java/com/whyc/service/KeyInfService.java
+++ b/src/main/java/com/whyc/service/KeyInfService.java
@@ -11,6 +11,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -18,8 +19,11 @@
 public class KeyInfService {
     @Autowired(required = false)
     private KeyInfMapper mapper;
+
+    @Autowired(required = false)
+    private AreaInfService areaInfService;
     //鏌ヨ鎵�鏈夐挜鍖欎俊鎭�
-    public Response getAllKeyInf(String keyName, String uname, int pageNum, int pageSize) {
+    public Response getAllKeyInf(String keyName, String uname,int areaId, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum,pageSize);
         QueryWrapper wrapper=new QueryWrapper();
         if(keyName!=null){
@@ -28,6 +32,13 @@
         if(uname!=null){
             wrapper.like("uname",uname);
         }
+        List areaList=new ArrayList();
+        areaList.add(areaId);
+        areaInfService.getAllAreaId(areaId,areaList);
+        if(areaList!=null){
+            wrapper.in("area_id",areaList);
+        }
+
         List<KeyInf> list=mapper.selectList(wrapper);
         PageInfo pageInfo=new PageInfo(list);
         return new Response().setII(1,list!=null,pageInfo,"鏌ヨ鎵�鏈夐挜鍖欎俊鎭�");

--
Gitblit v1.9.1