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 70291073..1fdce29b 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
@@ -686,7 +686,7 @@ public class CasesApi extends ApiBaseController {
     @SuppressWarnings("unchecked")
     @GetMapping("/queryPopularityOfMajor")
     public JsonResponse<List<Cases>> queryPopularityOfMajor(@RequestParam(required = false) Integer pageSize,
-                                                            @RequestParam Long majorId,
+                                                            @RequestParam String majorId,
                                                             @RequestParam LocalDateTime rankMonth) {
         String accountId = getCurrent().getAccountId();
         List<Cases> caseRankingVoList =casesService.queryPopularityOfMajor(pageSize,majorId,rankMonth,accountId);
diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRankDao.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRankDao.java
index 4669fe76..decfa067 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRankDao.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRankDao.java
@@ -63,7 +63,7 @@ public class CasesRankDao extends BaseDao<CasesRank> {
     }
 
 
-    public List<HashMap<String, Object>> findPopularityOfMajor(Integer pageSize, LocalDateTime startTime, LocalDateTime endTime, Long majorId) {
+    public List<HashMap<String, Object>> findPopularityOfMajor(Integer pageSize, LocalDateTime startTime, LocalDateTime endTime, String majorId) {
 
         String sql =
                 "SELECT bcr.case_id,bcr.rank\n" +
diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesService.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesService.java
index 659174ea..b114932e 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesService.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesService.java
@@ -133,7 +133,7 @@ public interface ICasesService{
 
     List<CaseRankingVo> queryRank(Integer pageSize, Integer rankType);
 
-    List<Cases> queryPopularityOfMajor(Integer pageSize, Long majorId, LocalDateTime month, String accountId);
+    List<Cases> queryPopularityOfMajor(Integer pageSize, String majorId, LocalDateTime month, String accountId);
 
     PageList<FavoriteCaseOfIndexVo> queryFavoriteCaseOfIndex(Integer pageIndex, Integer pageSize, String accountId);
 
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 cfcbe880..c723fe8f 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
@@ -509,7 +509,11 @@ public class CasesServiceImpl implements ICasesService {
 
             // 拼接生成年度最佳标签
             if (e.getExcellent()!=null && e.getExcellent()) {
-                e.setExcellentTag(e.getExcellentTime().format(DateTimeFormatter.ofPattern("yy年"))+"度最佳");
+                if (e.getDraftingTime()!=null){
+                    e.setExcellentTag(e.getDraftingTime().format(DateTimeFormatter.ofPattern("yy年"))+"度最佳");
+                } else {
+                    e.setExcellentTag(e.getSysCreateTime().format(DateTimeFormatter.ofPattern("yy年"))+"度最佳");
+                }
             }
 
             List<String> authorTags = new ArrayList<>();
@@ -1268,7 +1272,7 @@ public class CasesServiceImpl implements ICasesService {
 
 
     @Override
-    public List<Cases> queryPopularityOfMajor(Integer pageSize, Long majorId, LocalDateTime month, String accountId) {
+    public List<Cases> queryPopularityOfMajor(Integer pageSize, String majorId, LocalDateTime month, String accountId) {
         if (pageSize == null) {
             pageSize = 10;
         }