Merge branch 'master' into docker_package

Merge branch 'dev'
npe
2022-12-27 13:47:45 +08:00 · 2022-12-27 13:47:38 +08:00 · 2022-12-27 13:47:30 +08:00
1 changed files with 1 additions and 1 deletions
--- 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
@ -2949,7 +2949,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn

    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("非市级单位无法查浪潮数据");
            return new ArrayList<>();
        }
Author	SHA1	Message	Date
wangliwen	76c16cb5c1	Merge branch 'master' into docker_package	2022-12-27 13:47:45 +08:00
wangliwen	7068578fe3	Merge branch 'dev'	2022-12-27 13:47:38 +08:00
wangliwen	ffb0009a44	npe	2022-12-27 13:47:30 +08:00