Merge branch 'master' into docker_package

Merge branch 'dev'
能力统计-能力使用统计资源类型过滤失效
2023-01-11 13:02:22 +08:00 · 2023-01-11 13:02:15 +08:00 · 2023-01-11 13:02:07 +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
@ -2980,7 +2980,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
        List result = new ArrayList();

        if (!params.containsKey("type") ||
-                (params.containsKey("type") && org.apache.commons.lang3.StringUtils.isNotEmpty(params.get("type") != null ? params.get("type").toString() : null))
+                (params.containsKey("type") && org.apache.commons.lang3.StringUtils.isEmpty(params.get("type") != null ? params.get("type").toString() : null))
        ) { //查所有
            int total = 0;
            List<Map> ucsApplyDtoList = resourceDao.selectCensusApplyTable(params);
Author	SHA1	Message	Date
wangliwen	fa3bc6484a	Merge branch 'master' into docker_package	2023-01-11 13:02:22 +08:00
wangliwen	2c342eb087	Merge branch 'dev'	2023-01-11 13:02:15 +08:00
wangliwen	42449c79a2	能力统计-能力使用统计资源类型过滤失效	2023-01-11 13:02:07 +08:00