Merge branch 'master' into docker_package

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);

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; // 不传默认为中文走全文索引