wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-12-16 15:54:12 +08:00
parent 5a796ec8ff f0d398b9a4
commit 2e2f506866
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java
View File

@ -186,7 +186,7 @@ public class ResourceController {
} }
if (useIds1.contains(user.getId())) { // 区管理员 if (useIds1.contains(user.getId())) { // 区管理员
logger.info("区管理员"); logger.info("区管理员:" + sysDeptEntity.getDistrict());
SysDeptEntity finalSysDeptEntity = sysDeptEntity; SysDeptEntity finalSysDeptEntity = sysDeptEntity;
List<Long> deptId = sysDeptDao.getIdFromDistrict(sysDeptEntity.getDistrict()); List<Long> deptId = sysDeptDao.getIdFromDistrict(sysDeptEntity.getDistrict());
List<Long> temp = new ArrayList<Long>() { List<Long> temp = new ArrayList<Long>() {
@ -214,8 +214,8 @@ public class ResourceController {
break; break;
} }
} }
} }
break;
} }
PageData<ResourceDTO> page = resourceService.page(params); PageData<ResourceDTO> page = resourceService.page(params);

3
renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
View File

@ -563,7 +563,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
} }
if (useIds1.contains(user.getId())) { // 区管理员 if (useIds1.contains(user.getId())) { // 区管理员
logger.info("区管理员"); logger.info("区管理员" + sysDeptEntity.getDistrict());
SysDeptEntity finalSysDeptEntity = sysDeptEntity; SysDeptEntity finalSysDeptEntity = sysDeptEntity;
List<Long> deptId = sysDeptDao.getIdFromDistrict(sysDeptEntity.getDistrict()); List<Long> deptId = sysDeptDao.getIdFromDistrict(sysDeptEntity.getDistrict());
List<Long> temp = new ArrayList<Long>() { 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; // 不传默认为中文走全文索引 Boolean nonChinese = jsonObject.containsKey("nonChinese") ? jsonObject.getBoolean("nonChinese") : Boolean.FALSE; // 不传默认为中文走全文索引