|
@@ -188,10 +188,11 @@ public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, E
|
188
|
188
|
taExtendContentQueryWrapper.eq("status", 1);
|
189
|
189
|
taExtendContentQueryWrapper.eq("show_type", extendContent.getShowType());
|
190
|
190
|
taExtendContentQueryWrapper.eq("show_position", extendContent.getShowPosition());
|
|
191
|
+ taExtendContentQueryWrapper.eq(StringUtils.isNotBlank(String.valueOf(extendContent.getIsHaveActive())), "is_have_active", extendContent.getIsHaveActive());
|
191
|
192
|
if (null != extendContent.getContentId()){
|
192
|
193
|
taExtendContentQueryWrapper.ne("content_id", extendContent.getContentId());
|
193
|
194
|
}
|
194
|
|
- if (extendContent.getIsHaveActive() != null && extendContent.getIsHaveActive()){
|
|
195
|
+ if (extendContent.getIsHaveActive() != null ){
|
195
|
196
|
taExtendContentQueryWrapper.eq(StringUtils.isNotBlank(extendContent.getBuildingId()), "building_id", extendContent.getBuildingId());
|
196
|
197
|
}
|
197
|
198
|
List<ExtendContent> extContentInfo = extendContentMapper.selectList(taExtendContentQueryWrapper);
|