Merge remote-tracking branch 'origin/rs_gdweb_platform' into rs_gdweb_platform

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/rest/RscpMonitorimageController.java

@@ -31,6 +31,7 @@ public class RscpMonitorimageController extends BaseController<RscpMonitorimageB
         Example example = new Example(RscpMonitorimage.class);
         Example.Criteria criteria = example.createCriteria();
         criteria.andEqualTo("status",2);
+        criteria.andEqualTo("is_del",0);
         example.setOrderByClause("start_time DESC");
         PageDataVO pageDataVO = PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), ()->baseBiz.selectByExample(example));
         return ObjectRestResponse.succ(pageDataVO);
@@ -46,6 +47,7 @@ public class RscpMonitorimageController extends BaseController<RscpMonitorimageB
         Example example = new Example(RscpMonitorimage.class);
         Example.Criteria criteria = example.createCriteria();
         criteria.andEqualTo("status",2);
+        criteria.andEqualTo("is_del",0);
         example.setOrderByClause("hot DESC");
         PageDataVO pageDataVO = PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), ()->baseBiz.selectByExample(example));
         return ObjectRestResponse.succ(pageDataVO);
@@ -56,6 +58,7 @@ public class RscpMonitorimageController extends BaseController<RscpMonitorimageB
 
         List<RscpMonitorimage> list = baseBiz.selectByWeekend(w -> {
             w.andEqualTo(RscpMonitorimage::getStatus, 2);
+            w.andEqualTo(RscpMonitorimage::getIsDel, 0);
             return w;
         }, "start_time DESC");
         return ObjectRestResponse.succ(list);

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/rest/RscpMosaicimageController.java

@@ -36,6 +36,7 @@ public class RscpMosaicimageController extends BaseController<RscpMosaicimageBiz
 
         List<RscpMosaicimage> list = baseBiz.selectByWeekend(w -> {
             w.andEqualTo(RscpMosaicimage::getStatus, 2);
+            w.andEqualTo(RscpMosaicimage::getIsDel, 0);
             return w;
         }, "start_time asc");
         return ObjectRestResponse.succ(list);
@@ -48,6 +49,7 @@ public class RscpMosaicimageController extends BaseController<RscpMosaicimageBiz
         Example example = new Example(RscpMosaicimage.class);
         Example.Criteria criteria = example.createCriteria();
         criteria.andEqualTo("status",2);
+        criteria.andEqualTo("is_del",0);
         example.setOrderByClause("start_time DESC");
         PageDataVO pageDataVO = PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), ()->baseBiz.selectByExample(example));
         return ObjectRestResponse.succ(pageDataVO);
@@ -63,6 +65,7 @@ public class RscpMosaicimageController extends BaseController<RscpMosaicimageBiz
         Example example = new Example(RscpMosaicimage.class);
         Example.Criteria criteria = example.createCriteria();
         criteria.andEqualTo("status",2);
+        criteria.andEqualTo("is_del",0);
         example.setOrderByClause("hot DESC");
         PageDataVO pageDataVO = PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), ()->baseBiz.selectByExample(example));
         return ObjectRestResponse.succ(pageDataVO);