diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java
index 848c6816..4d9d665b 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java
@@ -150,6 +150,11 @@ public class CasesApi extends ApiBaseController {
 
                 }
             }
+        } else {
+            views = new PageList();
+            views.setList(Collections.emptyList());
+            views.setPageSize(req.getPageSize());
+            views.setCount(0);
         }
         return success(views);
     }
diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java
index 4823e308..a47fd1d5 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java
@@ -285,10 +285,13 @@ public class CasesServiceImpl implements ICasesService {
         } else {
             order = OrderCondition.desc("sysCreateTime");
         }
-
+        String type = caseVo.getType();
+        if (StrUtil.equals(type,"excellent")) {
+            query.addOrder(OrderCondition.rand());
+        } else {
+            query.addOrder(order);
+        }
         query.addFilters(filters);
-        query.addOrder(order);
-        query.addOrder(OrderCondition.rand());
         query.setPageIndex(caseVo.getPageIndex());
         query.setPageSize(caseVo.getPageSize());
         page = casesDao.findPage(query.builder());
@@ -845,7 +848,7 @@ public class CasesServiceImpl implements ICasesService {
     @Override
     public List<DictItem> majorTypes() {
         List<DictItem> major_type = sysDictionaryDao.findByKey("major_type");
-        String hql = "select cm.majorId,count(cm.id) from CasesMajorType cm,Cases c where cm.caseId=c.id and c.deleted=false and (c.filePath is not null or c.filePath!='') group by cm.majorId";
+        String hql = "select cm.majorId,count(cm.id) from CasesMajorType cm,Cases c where cm.caseId=c.id and cm.majorId=c.majorType and c.deleted=false and (c.filePath is not null or c.filePath!='') group by cm.majorId";
         List<Object[]> listByHql = casesDao.findListByHql(hql);
         List<DictItem> dictItems = new ArrayList<>();
         for (DictItem d : major_type) {