From 8884612800f496a655c8ae3fac2d527d10897fb1 Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Fri, 16 Dec 2022 15:53:50 +0800
Subject: [PATCH] ....

---
 .../modules/resource/controller/ResourceController.java       | 4 ++--
 .../modules/resource/service/impl/ResourceServiceImpl.java    | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java b/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java
index ba61032d..d2317ad9 100644
--- a/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java
+++ b/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java
@@ -186,7 +186,7 @@ public class ResourceController {
                     }
 
                     if (useIds1.contains(user.getId())) { // 区管理员
-                        logger.info("区管理员");
+                        logger.info("区管理员:" + sysDeptEntity.getDistrict());
                         SysDeptEntity finalSysDeptEntity = sysDeptEntity;
                         List<Long> deptId = sysDeptDao.getIdFromDistrict(sysDeptEntity.getDistrict());
                         List<Long> temp = new ArrayList<Long>() {
@@ -214,8 +214,8 @@ public class ResourceController {
                         break;
                     }
                 }
-
             }
+            break;
         }
 
         PageData<ResourceDTO> page = resourceService.page(params);
diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
index 701ab6af..308ca600 100644
--- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
+++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
@@ -563,7 +563,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
                     }
 
                     if (useIds1.contains(user.getId())) { // 区管理员
-                        logger.info("区管理员");
+                        logger.info("区管理员" + sysDeptEntity.getDistrict());
                         SysDeptEntity finalSysDeptEntity = sysDeptEntity;
                         List<Long> deptId = sysDeptDao.getIdFromDistrict(sysDeptEntity.getDistrict());
                         List<Long> temp = new ArrayList<Long>() {
@@ -599,6 +599,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
                 }
 
             }
+            break;
         }
 
         Boolean nonChinese = jsonObject.containsKey("nonChinese") ? jsonObject.getBoolean("nonChinese") : Boolean.FALSE; // 不传默认为中文走全文索引