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/UserInfService.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/whyc/service/UserInfService.java b/src/main/java/com/whyc/service/UserInfService.java
index d292a64..129752a 100644
--- a/src/main/java/com/whyc/service/UserInfService.java
+++ b/src/main/java/com/whyc/service/UserInfService.java
@@ -25,10 +25,12 @@
 import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -47,10 +49,11 @@
     @Autowired(required = false)
     private LockInfMapper linfMapper;
 
+
     //鏌ヨ鎵�鏈夌敤鎴蜂俊鎭�
-    public Response getAllUser(String uname,String realName,Integer role, int pageCurr, int pageSize) {
+    public Response getAllUser(String uname, String realName, Integer role, int areaId, int pageCurr, int pageSize) {
         PageHelper.startPage(pageCurr,pageSize);
-        List<UserInf> list=mapper.getAllUser(uname,realName,role);
+        List<UserInf> list=mapper.getAllUser(uname,realName,role,areaId);
         for (UserInf uinf:list) {
             QueryWrapper wrapper=new QueryWrapper();
             wrapper.eq("area_uname",uinf.getUname());
@@ -274,13 +277,13 @@
     }
     //鏌ヨ鏈鎸囧畾鍖哄煙鐨勭敤鎴�
     public Response getUnloadUinf() {
-        List<AreaInf> ainfList=ainfMapper.selectList(null);
+       /* List<AreaInf> ainfList=ainfMapper.selectList(null);
         List<String> unameList = ainfList.stream()
                 .map(AreaInf::getAreaUname) // 鎻愬彇鍚嶅瓧
-                .collect(Collectors.toList()); // 杞崲涓哄垪琛�
+                .collect(Collectors.toList()); // 杞崲涓哄垪琛�*/
         QueryWrapper wrapper=new QueryWrapper();
         wrapper.select("uname","uid","real_name","udownload_role","create_time");
-        wrapper.notIn("uname",unameList);
+        wrapper.eq("area)id",0);
         wrapper.gt("uid",100);
         List<UserInf> list=mapper.selectList(wrapper);
         return new Response().setII(1,list!=null,list,"鏌ヨ鏈鎸囧畾鍖哄煙鐨勭敤鎴�");

--
Gitblit v1.9.1