Merge branch 'dev'
This commit is contained in:
commit
2c342eb087
|
@ -2980,7 +2980,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
||||||
List result = new ArrayList();
|
List result = new ArrayList();
|
||||||
|
|
||||||
if (!params.containsKey("type") ||
|
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;
|
int total = 0;
|
||||||
List<Map> ucsApplyDtoList = resourceDao.selectCensusApplyTable(params);
|
List<Map> ucsApplyDtoList = resourceDao.selectCensusApplyTable(params);
|
||||||
|
|
Loading…
Reference in New Issue