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-27 13:47:45 +08:00
parent 2e8967a4f6 7068578fe3
commit 76c16cb5c1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2949,7 +2949,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
private List<Map> lcSelectCensusApplyTable(Map params) { private List<Map> lcSelectCensusApplyTable(Map params) {
if (params.get("region") != null && !"250000".equals(params.get("region").toString())) { if (params.containsKey("region") && params.get("region") != null && !"250000".equals(params.get("region").toString())) {
logger.error("非市级单位无法查浪潮数据"); logger.error("非市级单位无法查浪潮数据");
return new ArrayList<>(); return new ArrayList<>();
} }