From 642602bd940de295cbf22c186d10622fd4deadac Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期一, 30 十二月 2024 11:24:44 +0800
Subject: [PATCH] 区域添加id路径

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

diff --git a/src/main/java/com/whyc/service/UserInfService.java b/src/main/java/com/whyc/service/UserInfService.java
index bc9e286..26b14cb 100644
--- a/src/main/java/com/whyc/service/UserInfService.java
+++ b/src/main/java/com/whyc/service/UserInfService.java
@@ -44,6 +44,9 @@
     private AreaInfMapper ainfMapper;
 
     @Autowired(required = false)
+    private AreaInfService areaInfService;
+
+    @Autowired(required = false)
     private AuthiruzeInfMapper authMapper;
 
     @Autowired(required = false)
@@ -51,15 +54,19 @@
 
 
     //鏌ヨ鎵�鏈夌敤鎴蜂俊鎭�
-    public Response getAllUser(String uname, String realName, Integer urole, int areaId, int pageCurr, int pageSize) {
+    public Response getAllUser(String uname, String realName, int areaId, int pageCurr, int pageSize) {
         PageHelper.startPage(pageCurr,pageSize);
-        List<UserInf> list=mapper.getAllUser(uname,realName,urole,areaId);
-        for (UserInf uinf:list) {
+        UserInf uinf= ActionUtil.getUser();
+        List areaList=new ArrayList();
+        areaList.add(areaId);
+        areaInfService.getAllAreaId(areaId,areaList);
+        List<UserInf> list=mapper.getAllUser(uname,realName,uinf.getUrole(),areaList);
+        for (UserInf u:list) {
             QueryWrapper wrapper=new QueryWrapper();
-            wrapper.eq("area_uname",uinf.getUname());
+            wrapper.eq("id",u.getAreaId());
             wrapper.last("limit 1");
             AreaInf ainf=ainfMapper.selectOne(wrapper);
-            uinf.setAinf(ainf);
+            u.setAinf(ainf);
         }
         PageInfo pageInfo=new PageInfo(list);
         return new Response().setII(1,list!=null,pageInfo,"鏁版嵁杩斿洖");

--
Gitblit v1.9.1