|
@@ -121,7 +121,7 @@ public class AdminWebsitLogic {
|
|
}
|
|
}
|
|
|
|
|
|
public List<AdminWebsit> list(String type, Boolean isAll, Boolean isIncre, Boolean status, String streetCode, String channelId, String categoryId,
|
|
public List<AdminWebsit> list(String type, Boolean isAll, Boolean isIncre, Boolean status, String streetCode, String channelId, String categoryId,
|
|
- String orderSmallId, String orderSourceId, Boolean queryPartsWebsit) {
|
|
|
|
|
|
+ String orderSmallId, String orderSourceId, Boolean queryPartsWebsit, Integer level) {
|
|
AdminUserCom adminUser = commonLogic.getAdminUser();
|
|
AdminUserCom adminUser = commonLogic.getAdminUser();
|
|
|
|
|
|
|
|
|
|
@@ -139,6 +139,7 @@ public class AdminWebsitLogic {
|
|
|
|
|
|
|
|
|
|
List<AdminWebsit> list = adminWebsitService.lambdaQuery()
|
|
List<AdminWebsit> list = adminWebsitService.lambdaQuery()
|
|
|
|
+ .eq(Objects.nonNull(level), AdminWebsit::getLevel, level)
|
|
.eq(StringUtils.isNotBlank(type), AdminWebsit::getType, type)
|
|
.eq(StringUtils.isNotBlank(type), AdminWebsit::getType, type)
|
|
.in(StringUtils.isNotBlank(streetCode) && !CollectionUtils.isEmpty(websitIds), AdminWebsit::getWebsitId, websitIds)
|
|
.in(StringUtils.isNotBlank(streetCode) && !CollectionUtils.isEmpty(websitIds), AdminWebsit::getWebsitId, websitIds)
|
|
.eq(isIncre != null, AdminWebsit::getIsIncre, isIncre)
|
|
.eq(isIncre != null, AdminWebsit::getIsIncre, isIncre)
|