|
|
@@ -80,8 +80,7 @@ public class GovProjectCollectionManage { |
|
|
|
|
|
|
|
List<GovProjectDictionary> dictionaries = dictionaryService.list(Wrappers.lambdaQuery(GovProjectDictionary.class) |
|
|
|
.eq(StringUtils.isNotBlank(type), GovProjectDictionary::getType, type) |
|
|
|
.eq(GovProjectDictionary::getDeleted,Boolean.FALSE) |
|
|
|
.orderByDesc(GovProjectDictionary::getCreateOn)); |
|
|
|
.eq(GovProjectDictionary::getDeleted,Boolean.FALSE)); |
|
|
|
|
|
|
|
if(CollUtil.isEmpty(dictionaries)){ |
|
|
|
return Collections.emptyList(); |
|
|
@@ -106,7 +105,7 @@ public class GovProjectCollectionManage { |
|
|
|
.eq(GovBizProjectBaseinfo::getBaseBuildDeprtDing,user.getEmpPosUnitCode()) |
|
|
|
.eq(StringUtils.isNotBlank(req.getAreaCode()),GovBizProjectBaseinfo::getAreaCode,req.getAreaCode()) |
|
|
|
.eq(StringUtils.isNotBlank(req.getRegionCode()),GovBizProjectBaseinfo::getAreaCode,req.getRegionCode()) |
|
|
|
.orderByDesc(GovBizProjectBaseinfo::getBizTime); |
|
|
|
.orderByDesc(GovBizProjectBaseinfo::getTongTime); |
|
|
|
baseinfoService.page(page,wrapper); |
|
|
|
|
|
|
|
if(0L == page.getTotal()){ |
|
|
|