排序bug修改

sst-manager/src/main/java/com/mortals/xhx/module/sst/service/impl/SstAppsDeskServiceImpl.java

@@ -50,26 +50,28 @@ public class SstAppsDeskServiceImpl extends AbstractCRUDServiceImpl<SstAppsDeskD
         orderCols.put("basicSort","DESC");
         query.setOrderCols(orderCols);
         query.setSiteId(siteId);
-        List<SstAppsDeskEntity> appsEntities = this.find(query);
+        query.setShowBasic(1);
+        List<SstAppsDeskEntity> showApps = this.find(query);
         Map<String, Object> siteApp = new HashMap<>();
         siteApp.put("allApps", allApps);
-        if(CollectionUtils.isNotEmpty(appsEntities)){
-            List<SstAppsDeskEntity> showApps = new ArrayList<>();
-            List<SstAppsDeskEntity> hotApps = new ArrayList<>();
-            for(SstAppsDeskEntity SstAppsDeskEntity:appsEntities){
-                if(SstAppsDeskEntity.getShowBasic()==1){
-                    showApps.add(SstAppsDeskEntity);
-                }
-                if(SstAppsDeskEntity.getShowHot()==1){
-                    hotApps.add(SstAppsDeskEntity);
-                }
-            }
+        if(CollectionUtils.isNotEmpty(showApps)){
             siteApp.put("showApps", showApps);
-            siteApp.put("hotApps", hotApps);
         }else {
             siteApp.put("showApps", Collections.emptyList());
             siteApp.put("hotApps", Collections.emptyList());
         }
+        SstAppsDeskEntity query1 = new SstAppsDeskEntity();
+        Map<String,String> orderCols1 = new HashMap<>();
+        orderCols1.put("hotSort","DESC");
+        query1.setOrderCols(orderCols1);
+        query1.setSiteId(siteId);
+        query1.setShowHot(1);
+        List<SstAppsDeskEntity> hotApps = this.find(query1);
+        if(CollectionUtils.isNotEmpty(hotApps)){
+            siteApp.put("hotApps", hotApps);
+        }else {
+            siteApp.put("hotApps", Collections.emptyList());
+        }
         return siteApp;
     }
 

sst-manager/src/main/java/com/mortals/xhx/module/sst/service/impl/SstAppsServiceImpl.java

@@ -53,24 +53,25 @@ public class SstAppsServiceImpl extends AbstractCRUDServiceImpl<SstAppsDao, SstA
         orderCols.put("basicSort","DESC");
         query.setOrderCols(orderCols);
         query.setSiteId(siteId);
-        List<SstAppsEntity> appsEntities = this.find(query);
+        query.setShowBasic(1);
+        List<SstAppsEntity> showApps = this.find(query);
         Map<String, Object> siteApp = new HashMap<>();
         siteApp.put("allApps", allApps);
-        if(CollectionUtils.isNotEmpty(appsEntities)){
-            List<SstAppsEntity> showApps = new ArrayList<>();
-            List<SstAppsEntity> hotApps = new ArrayList<>();
-            for(SstAppsEntity sstAppsEntity:appsEntities){
-                if(sstAppsEntity.getShowBasic()==1){
-                    showApps.add(sstAppsEntity);
-                }
-                if(sstAppsEntity.getShowHot()==1){
-                    hotApps.add(sstAppsEntity);
-                }
-            }
+        if(CollectionUtils.isNotEmpty(showApps)){
             siteApp.put("showApps", showApps);
-            siteApp.put("hotApps", hotApps);
         }else {
             siteApp.put("showApps", Collections.emptyList());
+        }
+        SstAppsEntity query1 = new SstAppsEntity();
+        Map<String,String> orderCols1 = new HashMap<>();
+        orderCols1.put("hotSort","DESC");
+        query1.setOrderCols(orderCols1);
+        query1.setSiteId(siteId);
+        query1.setShowHot(1);
+        List<SstAppsEntity> hotApps = this.find(query1);
+        if(CollectionUtils.isNotEmpty(hotApps)){
+            siteApp.put("hotApps", hotApps);
+        }else {
             siteApp.put("hotApps", Collections.emptyList());
         }
         return siteApp;